summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/bike.s24
-rw-r--r--asm/event_object_80688E4.s (renamed from asm/map_obj_80688E4.s)60
-rw-r--r--asm/event_object_movement.s (renamed from asm/field_map_obj.s)1378
-rw-r--r--asm/field_camera.s4
-rw-r--r--asm/field_control_avatar.s54
-rw-r--r--asm/field_effect.s358
-rw-r--r--asm/field_effect_helpers.s244
-rw-r--r--asm/field_ground_effect.s56
-rw-r--r--asm/field_player_avatar.s282
-rw-r--r--asm/field_screen_effect.s6
-rw-r--r--asm/item_menu.s2
-rw-r--r--asm/link_rfu_3.s24
-rw-r--r--asm/macros.inc6
-rw-r--r--asm/naming_screen.s2
-rw-r--r--asm/overworld.s102
-rw-r--r--asm/script_movement.s20
-rw-r--r--asm/trainer_see.s110
17 files changed, 1369 insertions, 1363 deletions
diff --git a/asm/bike.s b/asm/bike.s
index 4d2683968..5bba18d71 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _080BD160 @ =gMapObjects
+ ldr r0, _080BD160 @ =gObjectEvents
adds r4, r0
bl player_get_direction_upper_nybble
lsls r0, 24
@@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100
b _080BD1B6
.align 2, 0
_080BD15C: .4byte gPlayerAvatar
-_080BD160: .4byte gMapObjects
+_080BD160: .4byte gObjectEvents
_080BD164: .4byte gMain
_080BD168:
ldrb r0, [r6]
@@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080BD244 @ =gMapObjects
+ ldr r1, _080BD244 @ =gObjectEvents
adds r0, r1
ldrb r0, [r0, 0x1E]
bl MetatileBehavior_IsCyclingRoadPullDownTile
@@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8
b _080BD270
.align 2, 0
_080BD240: .4byte gPlayerAvatar
-_080BD244: .4byte gMapObjects
+_080BD244: .4byte gObjectEvents
_080BD248:
movs r0, 0x2
strb r0, [r4, 0x2]
@@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080BD2C4 @ =gMapObjects
+ ldr r1, _080BD2C4 @ =gObjectEvents
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -299,7 +299,7 @@ _080BD2B2:
bx r0
.align 2, 0
_080BD2C0: .4byte gPlayerAvatar
-_080BD2C4: .4byte gMapObjects
+_080BD2C4: .4byte gObjectEvents
thumb_func_end sub_80BD28C
thumb_func_start sub_80BD2C8
@@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080BD2FC @ =gMapObjects
+ ldr r1, _080BD2FC @ =gObjectEvents
adds r5, r0, r1
ldrb r1, [r5, 0x1E]
adds r0, r4, 0
@@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8
b _080BD350
.align 2, 0
_080BD2F8: .4byte gPlayerAvatar
-_080BD2FC: .4byte gMapObjects
+_080BD2FC: .4byte gObjectEvents
_080BD300:
adds r0, r4, 0
bl sub_80BD3A0
@@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _080BD408 @ =gMapObjects
+ ldr r0, _080BD408 @ =gObjectEvents
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0
bx r1
.align 2, 0
_080BD404: .4byte gPlayerAvatar
-_080BD408: .4byte gMapObjects
+_080BD408: .4byte gObjectEvents
thumb_func_end sub_80BD3A0
thumb_func_start sub_80BD40C
@@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
lsls r0, 24
cmp r0, 0
beq _080BD5C0
- ldr r2, _080BD5B8 @ =gMapObjects
+ ldr r2, _080BD5B8 @ =gObjectEvents
ldr r0, _080BD5BC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
movs r0, 0
b _080BD5C2
.align 2, 0
-_080BD5B8: .4byte gMapObjects
+_080BD5B8: .4byte gObjectEvents
_080BD5BC: .4byte gPlayerAvatar
_080BD5C0:
movs r0, 0x1
diff --git a/asm/map_obj_80688E4.s b/asm/event_object_80688E4.s
index 04df8c938..1482529fe 100644
--- a/asm/map_obj_80688E4.s
+++ b/asm/event_object_80688E4.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start FreezeMapObject
-FreezeMapObject: @ 80688E4
+ thumb_func_start FreezeObjectEvent
+FreezeObjectEvent: @ 80688E4
push {r4,r5,lr}
adds r5, r0, 0
ldrh r1, [r5]
@@ -80,13 +80,13 @@ _0806896E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end FreezeMapObject
+ thumb_func_end FreezeObjectEvent
- thumb_func_start FreezeEventObjects
-FreezeEventObjects: @ 8068974
+ thumb_func_start FreezeObjectEvents
+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
-FreezeMapObjectsExceptOne: @ 80689B0
+ thumb_func_start FreezeObjectEventsExceptOne
+FreezeObjectEventsExceptOne: @ 80689B0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
- ldr r6, _080689EC @ =gMapObjects
+ ldr r6, _080689EC @ =gObjectEvents
_080689BA:
cmp r4, r5
beq _080689DC
@@ -139,7 +139,7 @@ _080689BA:
cmp r4, r0
beq _080689DC
adds r0, r1, 0
- bl FreezeMapObject
+ bl FreezeObjectEvent
_080689DC:
adds r0, r4, 0x1
lsls r0, 24
@@ -150,9 +150,9 @@ _080689DC:
pop {r0}
bx r0
.align 2, 0
-_080689EC: .4byte gMapObjects
+_080689EC: .4byte gObjectEvents
_080689F0: .4byte gPlayerAvatar
- thumb_func_end FreezeMapObjectsExceptOne
+ thumb_func_end FreezeObjectEventsExceptOne
thumb_func_start npc_sync_anim_pause_bits
npc_sync_anim_pause_bits: @ 80689F4
@@ -209,11 +209,11 @@ _08068A54: .4byte 0x00000101
_08068A58: .4byte gSprites
thumb_func_end npc_sync_anim_pause_bits
- thumb_func_start UnfreezeMapObjects
-UnfreezeMapObjects: @ 8068A5C
+ thumb_func_start UnfreezeObjectEvents
+UnfreezeObjectEvents: @ 8068A5C
push {r4,r5,lr}
movs r4, 0
- ldr r5, _08068A88 @ =gMapObjects
+ ldr r5, _08068A88 @ =gObjectEvents
_08068A62:
lsls r0, r4, 3
adds r0, r4
@@ -235,8 +235,8 @@ _08068A78:
pop {r0}
bx r0
.align 2, 0
-_08068A88: .4byte gMapObjects
- thumb_func_end UnfreezeMapObjects
+_08068A88: .4byte gObjectEvents
+ thumb_func_end UnfreezeObjectEvents
thumb_func_start little_step
little_step: @ 8068A8C
@@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202
_08068E54: .4byte gUnknown_83A7208
thumb_func_end sub_8068DC4
- thumb_func_start SetFieldObjectStepTimer
-SetFieldObjectStepTimer: @ 8068E58
+ thumb_func_start SetObjectEventStepTimer
+SetObjectEventStepTimer: @ 8068E58
strh r1, [r0, 0x34]
bx lr
- thumb_func_end SetFieldObjectStepTimer
+ thumb_func_end SetObjectEventStepTimer
- thumb_func_start RunFieldObjectStepTimer
-RunFieldObjectStepTimer: @ 8068E5C
+ thumb_func_start RunObjectEventStepTimer
+RunObjectEventStepTimer: @ 8068E5C
push {lr}
ldrh r1, [r0, 0x34]
subs r1, 0x1
@@ -810,7 +810,7 @@ _08068E6E:
_08068E70:
pop {r1}
bx r1
- thumb_func_end RunFieldObjectStepTimer
+ thumb_func_end RunObjectEventStepTimer
thumb_func_start obj_anim_image_set_and_seek
obj_anim_image_set_and_seek: @ 8068E74
@@ -1099,7 +1099,7 @@ sub_8069058: @ 8069058
ldr r0, _08069090 @ =gSprites
adds r4, r0
adds r0, r5, 0
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1130,7 +1130,7 @@ sub_8069094: @ 8069094
ldr r1, _080690F8 @ =gSprites
adds r4, r0, r1
adds r0, r5, 0
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldrh r3, [r4, 0x4]
lsls r3, 22
ldr r1, [r0, 0x10]
@@ -1441,7 +1441,7 @@ oe_exec_and_other_stuff: @ 80692C8
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
adds r0, r4, 0
bl FieldEffectStart
pop {r4}
@@ -1474,7 +1474,7 @@ DoRippleFieldEffect: @ 806930C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldr r2, _08069344 @ =gFieldEffectArguments
movs r3, 0x20
ldrsh r1, [r4, r3]
diff --git a/asm/field_map_obj.s b/asm/event_object_movement.s
index 8c782d3dd..66207007c 100644
--- a/asm/field_map_obj.s
+++ b/asm/event_object_movement.s
@@ -28,7 +28,7 @@ npc_clear_ids_and_state: @ 805DE2C
npcs_clear_ids_and_state: @ 805DE4C
push {r4,r5,lr}
movs r4, 0
- ldr r5, _0805DE70 @ =gMapObjects
+ ldr r5, _0805DE70 @ =gObjectEvents
_0805DE52:
lsls r0, r4, 3
adds r0, r4
@@ -44,7 +44,7 @@ _0805DE52:
pop {r0}
bx r0
.align 2, 0
-_0805DE70: .4byte gMapObjects
+_0805DE70: .4byte gObjectEvents
thumb_func_end npcs_clear_ids_and_state
thumb_func_start sub_805DE74
@@ -65,7 +65,7 @@ sub_805DE8C: @ 805DE8C
mov r5, r9
mov r4, r8
push {r4-r6}
- ldr r0, _0805DF28 @ =gUnknown_83A0010
+ ldr r0, _0805DF28 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x54]
mov r9, r0
movs r1, 0
@@ -133,7 +133,7 @@ sub_805DE8C: @ 805DE8C
pop {r0}
bx r0
.align 2, 0
-_0805DF28: .4byte gUnknown_83A0010
+_0805DF28: .4byte gFieldEffectObjectTemplatePointers
_0805DF2C: .4byte gSprites
thumb_func_end sub_805DE8C
@@ -141,11 +141,11 @@ _0805DF2C: .4byte gSprites
sub_805DF30: @ 805DF30
push {lr}
movs r1, 0
- ldr r2, _0805DF3C @ =gMapObjects
+ ldr r2, _0805DF3C @ =gObjectEvents
ldrb r0, [r2]
b _0805DF54
.align 2, 0
-_0805DF3C: .4byte gMapObjects
+_0805DF3C: .4byte gObjectEvents
_0805DF40:
adds r0, r1, 0x1
lsls r0, 24
@@ -167,8 +167,8 @@ _0805DF5A:
bx r1
thumb_func_end sub_805DF30
- thumb_func_start GetFieldObjectIdByLocalIdAndMap
-GetFieldObjectIdByLocalIdAndMap: @ 805DF60
+ thumb_func_start GetObjectEventIdByLocalIdAndMap
+GetObjectEventIdByLocalIdAndMap: @ 805DF60
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -178,19 +178,19 @@ GetFieldObjectIdByLocalIdAndMap: @ 805DF60
lsrs r2, 24
cmp r0, 0xFE
bls _0805DF78
- bl GetFieldObjectIdByLocalId
+ bl GetObjectEventIdByLocalId
b _0805DF7C
_0805DF78:
- bl GetFieldObjectIdByLocalIdAndMapInternal
+ bl GetObjectEventIdByLocalIdAndMapInternal
_0805DF7C:
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end GetFieldObjectIdByLocalIdAndMap
+ thumb_func_end GetObjectEventIdByLocalIdAndMap
- thumb_func_start TryGetFieldObjectIdByLocalIdAndMap
-TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84
+ thumb_func_start TryGetObjectEventIdByLocalIdAndMap
+TryGetObjectEventIdByLocalIdAndMap: @ 805DF84
push {r4,lr}
adds r4, r3, 0
lsls r0, 24
@@ -199,7 +199,7 @@ TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetObjectEventIdByLocalIdAndMap
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -213,13 +213,13 @@ _0805DFA8:
pop {r4}
pop {r1}
bx r1
- thumb_func_end TryGetFieldObjectIdByLocalIdAndMap
+ thumb_func_end TryGetObjectEventIdByLocalIdAndMap
- thumb_func_start GetFieldObjectIdByXY
-GetFieldObjectIdByXY: @ 805DFB0
+ thumb_func_start GetObjectEventIdByXY
+GetObjectEventIdByXY: @ 805DFB0
push {r4-r6,lr}
movs r3, 0
- ldr r5, _0805DFF0 @ =gMapObjects
+ ldr r5, _0805DFF0 @ =gObjectEvents
lsls r0, 16
asrs r4, r0, 16
lsls r1, 16
@@ -253,11 +253,11 @@ _0805DFE8:
pop {r1}
bx r1
.align 2, 0
-_0805DFF0: .4byte gMapObjects
- thumb_func_end GetFieldObjectIdByXY
+_0805DFF0: .4byte gObjectEvents
+ thumb_func_end GetObjectEventIdByXY
- thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal
-GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4
+ thumb_func_start GetObjectEventIdByLocalIdAndMapInternal
+GetObjectEventIdByLocalIdAndMapInternal: @ 805DFF4
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -266,7 +266,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4
lsls r2, 24
lsrs r2, 24
movs r1, 0
- ldr r6, _0805E02C @ =gMapObjects
+ ldr r6, _0805E02C @ =gObjectEvents
_0805E006:
lsls r0, r1, 3
adds r0, r1
@@ -288,7 +288,7 @@ _0805E006:
adds r0, r1, 0
b _0805E03C
.align 2, 0
-_0805E02C: .4byte gMapObjects
+_0805E02C: .4byte gObjectEvents
_0805E030:
adds r0, r1, 0x1
lsls r0, 24
@@ -300,15 +300,15 @@ _0805E03C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal
+ thumb_func_end GetObjectEventIdByLocalIdAndMapInternal
- thumb_func_start GetFieldObjectIdByLocalId
-GetFieldObjectIdByLocalId: @ 805E044
+ thumb_func_start GetObjectEventIdByLocalId
+GetObjectEventIdByLocalId: @ 805E044
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
movs r2, 0
- ldr r4, _0805E068 @ =gMapObjects
+ ldr r4, _0805E068 @ =gObjectEvents
_0805E04E:
lsls r0, r2, 3
adds r0, r2
@@ -324,7 +324,7 @@ _0805E04E:
adds r0, r2, 0
b _0805E078
.align 2, 0
-_0805E068: .4byte gMapObjects
+_0805E068: .4byte gObjectEvents
_0805E06C:
adds r0, r2, 0x1
lsls r0, 24
@@ -336,7 +336,7 @@ _0805E078:
pop {r4}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectIdByLocalId
+ thumb_func_end GetObjectEventIdByLocalId
thumb_func_start sub_805E080
sub_805E080: @ 805E080
@@ -389,7 +389,7 @@ _0805E0DA:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
- bl GetAvailableFieldObjectSlot
+ bl GetAvailableObjectEventSlot
lsls r0, 24
cmp r0, 0
bne _0805E106
@@ -414,7 +414,7 @@ _0805E10A:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805E13C @ =gMapObjects
+ ldr r1, _0805E13C @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
bl npc_clear_ids_and_state
@@ -434,7 +434,7 @@ _0805E10A:
adds r0, r1
b _0805E14E
.align 2, 0
-_0805E13C: .4byte gMapObjects
+_0805E13C: .4byte gObjectEvents
_0805E140:
ldrh r0, [r5, 0x4]
adds r0, 0x7
@@ -501,7 +501,7 @@ _0805E14E:
strb r0, [r4, 0x7]
ldrh r0, [r5, 0xE]
strb r0, [r4, 0x1D]
- ldr r1, _0805E230 @ =gUnknown_839FD5D
+ ldr r1, _0805E230 @ =gInitialMovementTypeFacingDirections
ldrb r0, [r5, 0x9]
adds r0, r1
ldrb r1, [r0]
@@ -510,10 +510,10 @@ _0805E14E:
strb r1, [r0]
ldrb r1, [r0]
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r4, 0
- bl FieldObjectHandleDynamicGraphicsId
- ldr r1, _0805E234 @ =gUnknown_839FD0C
+ bl ObjectEventHandleDynamicGraphicsId
+ ldr r1, _0805E234 @ =gRangedMovementTypes
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -559,8 +559,8 @@ _0805E220:
pop {r1}
bx r1
.align 2, 0
-_0805E230: .4byte gUnknown_839FD5D
-_0805E234: .4byte gUnknown_839FD0C
+_0805E230: .4byte gInitialMovementTypeFacingDirections
+_0805E234: .4byte gRangedMovementTypes
thumb_func_end sub_805E080
thumb_func_start sub_805E238
@@ -828,8 +828,8 @@ _0805E406:
_0805E410: .4byte gSaveBlock1Ptr
thumb_func_end sub_805E3A0
- thumb_func_start GetAvailableFieldObjectSlot
-GetAvailableFieldObjectSlot: @ 805E414
+ thumb_func_start GetAvailableObjectEventSlot
+GetAvailableObjectEventSlot: @ 805E414
push {r4-r7,lr}
mov r12, r3
lsls r0, 16
@@ -839,7 +839,7 @@ GetAvailableFieldObjectSlot: @ 805E414
lsls r2, 24
lsrs r4, r2, 24
movs r2, 0
- ldr r1, _0805E470 @ =gMapObjects
+ ldr r1, _0805E470 @ =gObjectEvents
ldrb r0, [r1]
lsls r0, 31
adds r7, r1, 0
@@ -881,11 +881,11 @@ _0805E46C:
movs r0, 0x1
b _0805E4A8
.align 2, 0
-_0805E470: .4byte gMapObjects
+_0805E470: .4byte gObjectEvents
_0805E474:
mov r0, r12
strb r2, [r0]
- ldr r1, _0805E4B0 @ =gMapObjects
+ ldr r1, _0805E4B0 @ =gObjectEvents
_0805E47A:
lsls r0, r2, 3
adds r0, r2
@@ -916,24 +916,24 @@ _0805E4A8:
pop {r1}
bx r1
.align 2, 0
-_0805E4B0: .4byte gMapObjects
- thumb_func_end GetAvailableFieldObjectSlot
+_0805E4B0: .4byte gObjectEvents
+ thumb_func_end GetAvailableObjectEventSlot
- thumb_func_start RemoveFieldObject
-RemoveFieldObject: @ 805E4B4
+ thumb_func_start RemoveObjectEvent
+RemoveObjectEvent: @ 805E4B4
push {lr}
ldrb r2, [r0]
movs r1, 0x2
negs r1, r1
ands r1, r2
strb r1, [r0]
- bl RemoveFieldObjectInternal
+ bl RemoveObjectEventInternal
pop {r0}
bx r0
- thumb_func_end RemoveFieldObject
+ thumb_func_end RemoveObjectEvent
- thumb_func_start RemoveFieldObjectByLocalIdAndMap
-RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
+ thumb_func_start RemoveObjectEventByLocalIdAndMap
+RemoveObjectEventByLocalIdAndMap: @ 805E4C8
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -943,13 +943,13 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805E506
mov r0, sp
ldrb r0, [r0]
- bl GetFieldObjectFlagIdByFieldObjectId
+ bl GetObjectEventFlagIdByObjectEventId
lsls r0, 16
lsrs r0, 16
bl FlagSet
@@ -958,24 +958,24 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805E50C @ =gMapObjects
+ ldr r1, _0805E50C @ =gObjectEvents
adds r0, r1
- bl RemoveFieldObject
+ bl RemoveObjectEvent
_0805E506:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
-_0805E50C: .4byte gMapObjects
- thumb_func_end RemoveFieldObjectByLocalIdAndMap
+_0805E50C: .4byte gObjectEvents
+ thumb_func_end RemoveObjectEventByLocalIdAndMap
- thumb_func_start RemoveFieldObjectInternal
-RemoveFieldObjectInternal: @ 805E510
+ thumb_func_start RemoveObjectEventInternal
+RemoveObjectEventInternal: @ 805E510
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
ldrb r0, [r4, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldrh r2, [r0, 0x6]
ldr r1, _0805E554 @ =0xffff0000
ldr r0, [sp, 0x4]
@@ -1005,7 +1005,7 @@ RemoveFieldObjectInternal: @ 805E510
.align 2, 0
_0805E554: .4byte 0xffff0000
_0805E558: .4byte gSprites
- thumb_func_end RemoveFieldObjectInternal
+ thumb_func_end RemoveObjectEventInternal
thumb_func_start unref_sub_808D958
unref_sub_808D958: @ 805E55C
@@ -1019,9 +1019,9 @@ _0805E560:
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
- ldr r1, _0805E58C @ =gMapObjects
+ ldr r1, _0805E58C @ =gObjectEvents
adds r0, r1
- bl RemoveFieldObject
+ bl RemoveObjectEvent
_0805E576:
adds r0, r4, 0x1
lsls r0, 24
@@ -1033,7 +1033,7 @@ _0805E576:
bx r0
.align 2, 0
_0805E588: .4byte gPlayerAvatar
-_0805E58C: .4byte gMapObjects
+_0805E58C: .4byte gObjectEvents
thumb_func_end unref_sub_808D958
thumb_func_start sub_805E590
@@ -1071,10 +1071,10 @@ _0805E5CA:
lsls r4, r0, 3
adds r0, r4, r0
lsls r0, 2
- ldr r1, _0805E5F4 @ =gMapObjects
+ ldr r1, _0805E5F4 @ =gObjectEvents
adds r5, r0, r1
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r6, r0, 0
ldrb r1, [r6, 0xC]
movs r0, 0xF
@@ -1087,7 +1087,7 @@ _0805E5CA:
bl npc_load_two_palettes__no_record
b _0805E606
.align 2, 0
-_0805E5F4: .4byte gMapObjects
+_0805E5F4: .4byte gObjectEvents
_0805E5F8:
cmp r0, 0xA
bne _0805E606
@@ -1116,7 +1116,7 @@ _0805E614:
lsrs r7, r0, 24
cmp r7, 0x40
bne _0805E650
- ldr r0, _0805E64C @ =gMapObjects
+ ldr r0, _0805E64C @ =gObjectEvents
mov r2, r8
adds r1, r4, r2
lsls r1, 2
@@ -1130,7 +1130,7 @@ _0805E614:
b _0805E718
.align 2, 0
_0805E648: .4byte 0x0000ffff
-_0805E64C: .4byte gMapObjects
+_0805E64C: .4byte gObjectEvents
_0805E650:
lsls r0, r7, 4
adds r0, r7
@@ -1212,7 +1212,7 @@ _0805E650:
ldrb r0, [r5, 0x18]
lsls r0, 28
lsrs r0, 28
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1240,8 +1240,8 @@ _0805E718:
_0805E728: .4byte gSprites
thumb_func_end sub_805E590
- thumb_func_start SpawnFieldObject
-SpawnFieldObject: @ 805E72C
+ thumb_func_start SpawnObjectEvent
+SpawnObjectEvent: @ 805E72C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1266,12 +1266,12 @@ SpawnFieldObject: @ 805E72C
str r0, [sp, 0x20]
mov r1, r9
ldrb r0, [r1, 0x1]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r7, r0, 0
add r2, sp, 0x20
mov r0, r9
add r1, sp, 0x8
- bl MakeObjectTemplateFromFieldObjectTemplate
+ bl MakeObjectTemplateFromObjectEventTemplate
ldrh r3, [r7, 0x6]
ldr r2, _0805E7A4 @ =0xffff0000
add r1, sp, 0x24
@@ -1302,7 +1302,7 @@ SpawnFieldObject: @ 805E72C
_0805E7A4: .4byte 0xffff0000
_0805E7A8:
ldr r4, _0805E7EC @ =gSprites
- ldr r1, _0805E7F0 @ =gMapObjects
+ ldr r1, _0805E7F0 @ =gObjectEvents
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@@ -1338,11 +1338,11 @@ _0805E7DE:
bx r1
.align 2, 0
_0805E7EC: .4byte gSprites
-_0805E7F0: .4byte gMapObjects
- thumb_func_end SpawnFieldObject
+_0805E7F0: .4byte gObjectEvents
+ thumb_func_end SpawnObjectEvent
- thumb_func_start SpawnSpecialFieldObject
-SpawnSpecialFieldObject: @ 805E7F4
+ thumb_func_start SpawnSpecialObjectEvent
+SpawnSpecialObjectEvent: @ 805E7F4
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -1350,7 +1350,7 @@ SpawnSpecialFieldObject: @ 805E7F4
adds r4, 0x6
add r0, sp, 0x4
adds r1, r4, 0
- bl GetFieldObjectMovingCameraOffset
+ bl GetObjectEventMovingCameraOffset
ldr r0, _0805E82C @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrb r1, [r0, 0x5]
@@ -1362,7 +1362,7 @@ SpawnSpecialFieldObject: @ 805E7F4
ldrsh r0, [r4, r6]
str r0, [sp]
adds r0, r5, 0
- bl SpawnFieldObject
+ bl SpawnObjectEvent
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -1371,10 +1371,10 @@ SpawnSpecialFieldObject: @ 805E7F4
bx r1
.align 2, 0
_0805E82C: .4byte gSaveBlock1Ptr
- thumb_func_end SpawnSpecialFieldObject
+ thumb_func_end SpawnSpecialObjectEvent
- thumb_func_start SpawnSpecialFieldObjectParameterized
-SpawnSpecialFieldObjectParameterized: @ 805E830
+ thumb_func_start SpawnSpecialObjectEventParameterized
+SpawnSpecialObjectEventParameterized: @ 805E830
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1414,7 +1414,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830
strb r5, [r0, 0xA]
strh r6, [r0, 0xC]
strh r6, [r0, 0xE]
- bl SpawnSpecialFieldObject
+ bl SpawnSpecialObjectEvent
lsls r0, 24
lsrs r0, 24
add sp, 0x18
@@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830
bx r1
.align 2, 0
_0805E894: .4byte 0xfff90000
- thumb_func_end SpawnSpecialFieldObjectParameterized
+ thumb_func_end SpawnSpecialObjectEventParameterized
thumb_func_start show_sprite
show_sprite: @ 805E898
@@ -1439,7 +1439,7 @@ show_sprite: @ 805E898
lsrs r6, r2, 24
adds r1, r7, 0
adds r2, r6, 0
- bl GetFieldObjectTemplateByLocalIdAndMap
+ bl GetObjectEventTemplateByLocalIdAndMap
adds r5, r0, 0
cmp r5, 0
beq _0805E8DE
@@ -1447,7 +1447,7 @@ show_sprite: @ 805E898
adds r4, 0x6
add r0, sp, 0x4
adds r1, r4, 0
- bl GetFieldObjectMovingCameraOffset
+ bl GetObjectEventMovingCameraOffset
add r0, sp, 0x4
movs r1, 0
ldrsh r3, [r0, r1]
@@ -1457,7 +1457,7 @@ show_sprite: @ 805E898
adds r0, r5, 0
adds r1, r7, 0
adds r2, r6, 0
- bl SpawnFieldObject
+ bl SpawnObjectEvent
lsls r0, 24
lsrs r0, 24
b _0805E8E0
@@ -1478,7 +1478,7 @@ sub_805E8E8: @ 805E8E8
adds r7, r3, 0
lsls r0, 24
lsrs r0, 24
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r5, r0, 0
ldrh r0, [r5]
strh r0, [r4]
@@ -1517,13 +1517,13 @@ _0805E936:
bx r0
thumb_func_end sub_805E8E8
- thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
-MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
+ thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
+MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
- ldr r4, _0805E95C @ =gUnknown_839FBC8
+ ldr r4, _0805E95C @ =gMovementTypeCallbacks
lsrs r1, 14
adds r1, r4
ldr r1, [r1]
@@ -1532,11 +1532,11 @@ MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
pop {r0}
bx r0
.align 2, 0
-_0805E95C: .4byte gUnknown_839FBC8
- thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+_0805E95C: .4byte gMovementTypeCallbacks
+ thumb_func_end MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
- thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
-MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
+ thumb_func_start MakeObjectTemplateFromObjectEventTemplate
+MakeObjectTemplateFromObjectEventTemplate: @ 805E960
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1544,14 +1544,14 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
ldrb r0, [r4, 0x1]
ldrb r1, [r4, 0x9]
adds r2, r5, 0
- bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+ bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
+ thumb_func_end MakeObjectTemplateFromObjectEventTemplate
- thumb_func_start AddPseudoEventObject
-AddPseudoEventObject: @ 805E978
+ thumb_func_start AddPseudoObjectEvent
+AddPseudoObjectEvent: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
- thumb_func_end AddPseudoEventObject
+ thumb_func_end AddPseudoObjectEvent
thumb_func_start sprite_new
sprite_new: @ 805E9F8
@@ -1643,7 +1643,7 @@ sprite_new: @ 805E9F8
lsrs r4, 24
str r4, [sp, 0x20]
adds r0, r5, 0
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r4, r0, 0
ldr r1, _0805EB38 @ =sub_8068FA8
add r3, sp, 0x1C
@@ -1752,7 +1752,7 @@ _0805EB00:
movs r2, 0x1
bl SetObjectSubpriorityByZCoord
ldr r0, [sp, 0x20]
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1793,7 +1793,7 @@ sub_805EB44: @ 805EB44
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r7, r0, 0
ldr r1, _0805EC24 @ =SpriteCallbackDummy
add r3, sp, 0x18
@@ -1869,7 +1869,7 @@ _0805EBE6:
strb r1, [r2]
_0805EC02:
movs r0, 0x1
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1983,7 +1983,7 @@ _0805EC86:
str r0, [sp]
adds r0, r4, 0
asrs r3, 16
- bl SpawnFieldObject
+ bl SpawnObjectEvent
_0805ECEC:
adds r0, r5, 0x1
lsls r0, 24
@@ -2005,8 +2005,8 @@ _0805ED08: .4byte gMapHeader
_0805ED0C: .4byte gSaveBlock1Ptr
thumb_func_end sub_805EC30
- thumb_func_start RemoveFieldObjectsOutsideView
-RemoveFieldObjectsOutsideView: @ 805ED10
+ thumb_func_start RemoveObjectEventsOutsideView
+RemoveObjectEventsOutsideView: @ 805ED10
push {r4-r6,lr}
movs r3, 0
ldr r6, _0805ED64 @ =gUnknown_2031DEC
@@ -2035,7 +2035,7 @@ _0805ED2E:
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
- ldr r1, _0805ED68 @ =gMapObjects
+ ldr r1, _0805ED68 @ =gObjectEvents
adds r2, r0, r1
ldr r0, [r2]
ldr r1, _0805ED6C @ =0x00010001
@@ -2043,7 +2043,7 @@ _0805ED2E:
cmp r0, 0x1
bne _0805ED56
adds r0, r2, 0
- bl RemoveFieldObjectIfOutsideView
+ bl RemoveObjectEventIfOutsideView
_0805ED56:
lsls r0, r5, 24
lsrs r3, r0, 24
@@ -2054,12 +2054,12 @@ _0805ED56:
bx r0
.align 2, 0
_0805ED64: .4byte gUnknown_2031DEC
-_0805ED68: .4byte gMapObjects
+_0805ED68: .4byte gObjectEvents
_0805ED6C: .4byte 0x00010001
- thumb_func_end RemoveFieldObjectsOutsideView
+ thumb_func_end RemoveObjectEventsOutsideView
- thumb_func_start RemoveFieldObjectIfOutsideView
-RemoveFieldObjectIfOutsideView: @ 805ED70
+ thumb_func_start RemoveObjectEventIfOutsideView
+RemoveObjectEventIfOutsideView: @ 805ED70
push {r4-r7,lr}
adds r3, r0, 0
ldr r0, _0805EDEC @ =gSaveBlock1Ptr
@@ -2118,14 +2118,14 @@ _0805EDB6:
ble _0805EDE4
_0805EDDE:
adds r0, r3, 0
- bl RemoveFieldObject
+ bl RemoveObjectEvent
_0805EDE4:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0805EDEC: .4byte gSaveBlock1Ptr
- thumb_func_end RemoveFieldObjectIfOutsideView
+ thumb_func_end RemoveObjectEventIfOutsideView
thumb_func_start sub_805EDF0
sub_805EDF0: @ 805EDF0
@@ -2138,7 +2138,7 @@ sub_805EDF0: @ 805EDF0
lsrs r5, 16
bl ClearPlayerAvatarInfo
movs r6, 0
- ldr r7, _0805EE38 @ =gMapObjects
+ ldr r7, _0805EE38 @ =gObjectEvents
lsls r4, 16
lsls r5, 16
_0805EE0A:
@@ -2165,7 +2165,7 @@ _0805EE24:
pop {r0}
bx r0
.align 2, 0
-_0805EE38: .4byte gMapObjects
+_0805EE38: .4byte gObjectEvents
thumb_func_end sub_805EDF0
thumb_func_start sub_805EE3C
@@ -2207,12 +2207,12 @@ _0805EE70:
lsls r0, r1, 3
add r0, r8
lsls r0, 2
- ldr r1, _0805EFE4 @ =gMapObjects
+ ldr r1, _0805EFE4 @ =gObjectEvents
adds r6, r0, r1
movs r0, 0
str r0, [sp, 0x20]
ldrb r0, [r6, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r5, r0, 0
ldrh r2, [r5, 0x6]
ldr r1, _0805EFE8 @ =0xffff0000
@@ -2225,7 +2225,7 @@ _0805EE70:
ldrb r1, [r6, 0x6]
add r3, sp, 0x20
mov r2, sp
- bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+ bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
str r4, [sp, 0xC]
mov r0, sp
ldr r2, _0805EFEC @ =0x0000ffff
@@ -2314,7 +2314,7 @@ _0805EEDC:
bne _0805EF6A
mov r0, r8
adds r1, r7, 0
- bl SetPlayerAvatarFieldObjectIdAndObjectId
+ bl SetPlayerAvatarObjectEventIdAndObjectId
bl sub_80DB0C4
strb r0, [r6, 0x1B]
_0805EF6A:
@@ -2351,7 +2351,7 @@ _0805EF76:
ldrb r0, [r6, 0x18]
lsls r0, 28
lsrs r0, 28
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2376,7 +2376,7 @@ _0805EFCE:
bx r0
.align 2, 0
_0805EFE0: .4byte gUnknown_2031DEC
-_0805EFE4: .4byte gMapObjects
+_0805EFE4: .4byte gObjectEvents
_0805EFE8: .4byte 0xffff0000
_0805EFEC: .4byte 0x0000ffff
_0805EFF0: .4byte gSprites
@@ -2408,20 +2408,20 @@ sub_805EFF4: @ 805EFF4
subs r2, 0x10
ands r1, r2
strb r1, [r0, 0x2]
- bl FieldObjectClearAnim
+ bl ObjectEventClearAnim
pop {r0}
bx r0
thumb_func_end sub_805EFF4
- thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId
-SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
+ thumb_func_start SetPlayerAvatarObjectEventIdAndObjectId
+SetPlayerAvatarObjectEventIdAndObjectId: @ 805F02C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, _0805F058 @ =gPlayerAvatar
strb r0, [r5, 0x5]
strb r1, [r5, 0x4]
- ldr r1, _0805F05C @ =gMapObjects
+ ldr r1, _0805F05C @ =gObjectEvents
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
@@ -2437,11 +2437,11 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
bx r0
.align 2, 0
_0805F058: .4byte gPlayerAvatar
-_0805F05C: .4byte gMapObjects
- thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
+_0805F05C: .4byte gObjectEvents
+ thumb_func_end SetPlayerAvatarObjectEventIdAndObjectId
- thumb_func_start EventObjectSetGraphicsId
-EventObjectSetGraphicsId: @ 805F060
+ thumb_func_start ObjectEventSetGraphicsId
+ObjectEventSetGraphicsId: @ 805F060
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2453,7 +2453,7 @@ EventObjectSetGraphicsId: @ 805F060
lsrs r1, 24
str r1, [sp]
adds r0, r1, 0
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r5, r0, 0
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
@@ -2625,10 +2625,10 @@ _0805F1BA:
_0805F1CC: .4byte gSprites
_0805F1D0: .4byte 0x000003ff
_0805F1D4: .4byte 0xfffffc00
- thumb_func_end EventObjectSetGraphicsId
+ thumb_func_end ObjectEventSetGraphicsId
- thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap
-FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
+ thumb_func_start ObjectEventSetGraphicsIdByLocalIdAndMap
+ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -2640,7 +2640,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F20C
@@ -2649,26 +2649,26 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805F214 @ =gMapObjects
+ ldr r1, _0805F214 @ =gObjectEvents
adds r0, r1
adds r1, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_0805F20C:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_0805F214: .4byte gMapObjects
- thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap
+_0805F214: .4byte gObjectEvents
+ thumb_func_end ObjectEventSetGraphicsIdByLocalIdAndMap
- thumb_func_start FieldObjectTurn
-FieldObjectTurn: @ 805F218
+ thumb_func_start ObjectEventTurn
+ObjectEventTurn: @ 805F218
push {r4-r6,lr}
adds r6, r0, 0
lsls r1, 24
lsrs r1, 24
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r0, [r6, 0x1]
lsls r0, 27
cmp r0, 0
@@ -2682,7 +2682,7 @@ FieldObjectTurn: @ 805F218
ldrb r0, [r6, 0x18]
lsls r0, 28
lsrs r0, 28
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2701,10 +2701,10 @@ _0805F25E:
bx r0
.align 2, 0
_0805F264: .4byte gSprites
- thumb_func_end FieldObjectTurn
+ thumb_func_end ObjectEventTurn
- thumb_func_start FieldObjectTurnByLocalIdAndMap
-FieldObjectTurnByLocalIdAndMap: @ 805F268
+ thumb_func_start ObjectEventTurnByLocalIdAndMap
+ObjectEventTurnByLocalIdAndMap: @ 805F268
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -2716,7 +2716,7 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F29C
@@ -2725,18 +2725,18 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805F2A4 @ =gMapObjects
+ ldr r1, _0805F2A4 @ =gObjectEvents
adds r0, r1
adds r1, r4, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
_0805F29C:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_0805F2A4: .4byte gMapObjects
- thumb_func_end FieldObjectTurnByLocalIdAndMap
+_0805F2A4: .4byte gObjectEvents
+ thumb_func_end ObjectEventTurnByLocalIdAndMap
thumb_func_start PlayerObjectTurn
PlayerObjectTurn: @ 805F2A8
@@ -2747,17 +2747,17 @@ PlayerObjectTurn: @ 805F2A8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805F2C4 @ =gMapObjects
+ ldr r2, _0805F2C4 @ =gObjectEvents
adds r0, r2
- bl FieldObjectTurn
+ bl ObjectEventTurn
pop {r0}
bx r0
.align 2, 0
-_0805F2C4: .4byte gMapObjects
+_0805F2C4: .4byte gObjectEvents
thumb_func_end PlayerObjectTurn
- thumb_func_start GetFieldObjectGraphicsInfo
-GetFieldObjectGraphicsInfo: @ 805F2C8
+ thumb_func_start GetObjectEventGraphicsInfo
+GetObjectEventGraphicsInfo: @ 805F2C8
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -2767,25 +2767,25 @@ GetFieldObjectGraphicsInfo: @ 805F2C8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
- bl VarGetFieldObjectGraphicsId
+ bl VarGetObjectEventGraphicsId
adds r1, r0, 0
_0805F2E0:
cmp r1, 0x97
bls _0805F2E6
movs r1, 0x10
_0805F2E6:
- ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers
+ ldr r0, _0805F2F4 @ =gObjectEventGraphicsInfoPointers
lsls r1, 2
adds r1, r0
ldr r0, [r1]
pop {r1}
bx r1
.align 2, 0
-_0805F2F4: .4byte gMapObjectGraphicsInfoPointers
- thumb_func_end GetFieldObjectGraphicsInfo
+_0805F2F4: .4byte gObjectEventGraphicsInfoPointers
+ thumb_func_end GetObjectEventGraphicsInfo
- thumb_func_start FieldObjectHandleDynamicGraphicsId
-FieldObjectHandleDynamicGraphicsId: @ 805F2F8
+ thumb_func_start ObjectEventHandleDynamicGraphicsId
+ObjectEventHandleDynamicGraphicsId: @ 805F2F8
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x5]
@@ -2794,13 +2794,13 @@ FieldObjectHandleDynamicGraphicsId: @ 805F2F8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
- bl VarGetFieldObjectGraphicsId
+ bl VarGetObjectEventGraphicsId
strb r0, [r4, 0x5]
_0805F30E:
pop {r4}
pop {r0}
bx r0
- thumb_func_end FieldObjectHandleDynamicGraphicsId
+ thumb_func_end ObjectEventHandleDynamicGraphicsId
thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20
npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314
@@ -2815,11 +2815,11 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F356
- ldr r2, _0805F360 @ =gMapObjects
+ ldr r2, _0805F360 @ =gObjectEvents
mov r0, sp
ldrb r0, [r0]
lsls r1, r0, 3
@@ -2842,11 +2842,11 @@ _0805F356:
pop {r0}
bx r0
.align 2, 0
-_0805F360: .4byte gMapObjects
+_0805F360: .4byte gObjectEvents
thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20
- thumb_func_start FieldObjectGetLocalIdAndMap
-FieldObjectGetLocalIdAndMap: @ 805F364
+ thumb_func_start ObjectEventGetLocalIdAndMap
+ObjectEventGetLocalIdAndMap: @ 805F364
push {r4,lr}
ldrb r4, [r0, 0x8]
strb r4, [r1]
@@ -2857,7 +2857,7 @@ FieldObjectGetLocalIdAndMap: @ 805F364
pop {r4}
pop {r0}
bx r0
- thumb_func_end FieldObjectGetLocalIdAndMap
+ thumb_func_end ObjectEventGetLocalIdAndMap
thumb_func_start sub_805F378
sub_805F378: @ 805F378
@@ -2866,7 +2866,7 @@ sub_805F378: @ 805F378
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl GetFieldObjectIdByXY
+ bl GetObjectEventIdByXY
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x10
@@ -2874,7 +2874,7 @@ sub_805F378: @ 805F378
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805F3A4 @ =gMapObjects
+ ldr r1, _0805F3A4 @ =gObjectEvents
adds r0, r1
ldrb r1, [r0]
movs r2, 0x4
@@ -2884,7 +2884,7 @@ _0805F3A0:
pop {r0}
bx r0
.align 2, 0
-_0805F3A4: .4byte gMapObjects
+_0805F3A4: .4byte gObjectEvents
thumb_func_end sub_805F378
thumb_func_start sub_805F3A8
@@ -2900,7 +2900,7 @@ sub_805F3A8: @ 805F3A8
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F3EE
@@ -2909,7 +2909,7 @@ sub_805F3A8: @ 805F3A8
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
- ldr r0, _0805F3F8 @ =gMapObjects
+ ldr r0, _0805F3F8 @ =gObjectEvents
adds r2, r0
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -2929,7 +2929,7 @@ _0805F3EE:
pop {r0}
bx r0
.align 2, 0
-_0805F3F8: .4byte gMapObjects
+_0805F3F8: .4byte gObjectEvents
_0805F3FC: .4byte gSprites
thumb_func_end sub_805F3A8
@@ -2944,7 +2944,7 @@ sub_805F400: @ 805F400
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F43C
@@ -2953,7 +2953,7 @@ sub_805F400: @ 805F400
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _0805F444 @ =gMapObjects
+ ldr r0, _0805F444 @ =gObjectEvents
adds r1, r0
ldrb r2, [r1, 0x3]
movs r0, 0x5
@@ -2969,7 +2969,7 @@ _0805F43C:
pop {r0}
bx r0
.align 2, 0
-_0805F444: .4byte gMapObjects
+_0805F444: .4byte gObjectEvents
thumb_func_end sub_805F400
thumb_func_start sub_805F448
@@ -2988,11 +2988,11 @@ sub_805F448: @ 805F448
lsls r4, 16
lsrs r4, 16
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F48C
- ldr r2, _0805F494 @ =gMapObjects
+ ldr r2, _0805F494 @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3013,7 +3013,7 @@ _0805F48C:
pop {r0}
bx r0
.align 2, 0
-_0805F494: .4byte gMapObjects
+_0805F494: .4byte gObjectEvents
_0805F498: .4byte gSprites
thumb_func_end sub_805F448
@@ -3035,14 +3035,14 @@ sub_805F4B0: @ 805F4B0
push {lr}
lsls r0, 16
lsrs r0, 16
- bl FindFieldObjectPaletteIndexByTag
+ bl FindObjectEventPaletteIndexByTag
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0805F4D4 @ =0x000011ff
cmp r1, r0
beq _0805F4CE
lsls r0, r1, 3
- ldr r1, _0805F4D8 @ =gUnknown_83A5158
+ ldr r1, _0805F4D8 @ =gObjectEventSpritePalettes
adds r0, r1
bl sub_805F510
_0805F4CE:
@@ -3050,7 +3050,7 @@ _0805F4CE:
bx r0
.align 2, 0
_0805F4D4: .4byte 0x000011ff
-_0805F4D8: .4byte gUnknown_83A5158
+_0805F4D8: .4byte gObjectEventSpritePalettes
thumb_func_end sub_805F4B0
thumb_func_start sub_805F4DC
@@ -3115,9 +3115,9 @@ pal_patch_for_npc: @ 805F538
lsrs r0, 16
lsls r4, 24
lsrs r4, 24
- bl FindFieldObjectPaletteIndexByTag
+ bl FindObjectEventPaletteIndexByTag
lsls r0, 24
- ldr r1, _0805F570 @ =gUnknown_83A5158
+ ldr r1, _0805F570 @ =gObjectEventSpritePalettes
lsrs r0, 21
adds r0, r1
ldr r0, [r0]
@@ -3134,7 +3134,7 @@ pal_patch_for_npc: @ 805F538
pop {r0}
bx r0
.align 2, 0
-_0805F570: .4byte gUnknown_83A5158
+_0805F570: .4byte gObjectEventSpritePalettes
thumb_func_end pal_patch_for_npc
thumb_func_start pal_patch_for_npc_range
@@ -3163,13 +3163,13 @@ _0805F598:
bx r0
thumb_func_end pal_patch_for_npc_range
- thumb_func_start FindFieldObjectPaletteIndexByTag
-FindFieldObjectPaletteIndexByTag: @ 805F5A0
+ thumb_func_start FindObjectEventPaletteIndexByTag
+FindObjectEventPaletteIndexByTag: @ 805F5A0
push {r4-r6,lr}
lsls r0, 16
lsrs r5, r0, 16
movs r2, 0
- ldr r0, _0805F5C8 @ =gUnknown_83A5158
+ ldr r0, _0805F5C8 @ =gObjectEventSpritePalettes
ldrh r1, [r0, 0x4]
ldr r3, _0805F5CC @ =0x000011ff
adds r4, r0, 0
@@ -3186,7 +3186,7 @@ _0805F5B8:
adds r0, r2, 0
b _0805F5E2
.align 2, 0
-_0805F5C8: .4byte gUnknown_83A5158
+_0805F5C8: .4byte gObjectEventSpritePalettes
_0805F5CC: .4byte 0x000011ff
_0805F5D0:
adds r0, r2, 0x1
@@ -3203,7 +3203,7 @@ _0805F5E2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end FindFieldObjectPaletteIndexByTag
+ thumb_func_end FindObjectEventPaletteIndexByTag
thumb_func_start npc_load_two_palettes__no_record
npc_load_two_palettes__no_record: @ 805F5E8
@@ -3395,7 +3395,7 @@ sub_805F724: @ 805F724
ldr r1, _0805F7C0 @ =gSprites
adds r7, r0, r1
ldrb r0, [r6, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
mov r8, r0
lsls r4, 16
asrs r4, 16
@@ -3472,7 +3472,7 @@ sub_805F7C4: @ 805F7C4
lsls r4, 16
lsrs r4, 16
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F80C
@@ -3483,7 +3483,7 @@ sub_805F7C4: @ 805F7C4
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
- ldr r3, _0805F814 @ =gMapObjects
+ ldr r3, _0805F814 @ =gObjectEvents
adds r0, r3
movs r3, 0xE0
lsls r3, 11
@@ -3498,7 +3498,7 @@ _0805F80C:
pop {r0}
bx r0
.align 2, 0
-_0805F814: .4byte gMapObjects
+_0805F814: .4byte gObjectEvents
thumb_func_end sub_805F7C4
thumb_func_start npc_coords_shift_still
@@ -3513,8 +3513,8 @@ npc_coords_shift_still: @ 805F818
bx r0
thumb_func_end npc_coords_shift_still
- thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
-UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
+ thumb_func_start UpdateObjectEventCoordsForCameraUpdate
+UpdateObjectEventCoordsForCameraUpdate: @ 805F82C
push {r4,r5,lr}
ldr r2, _0805F88C @ =gCamera
ldrb r1, [r2]
@@ -3523,7 +3523,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
cmp r0, 0
beq _0805F884
movs r3, 0
- ldr r5, _0805F890 @ =gMapObjects
+ ldr r5, _0805F890 @ =gObjectEvents
movs r0, 0x4
ldrsh r4, [r2, r0]
movs r0, 0x8
@@ -3567,11 +3567,11 @@ _0805F884:
bx r0
.align 2, 0
_0805F88C: .4byte gCamera
-_0805F890: .4byte gMapObjects
- thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
+_0805F890: .4byte gObjectEvents
+ thumb_func_end UpdateObjectEventCoordsForCameraUpdate
- thumb_func_start GetFieldObjectIdByXYZ
-GetFieldObjectIdByXYZ: @ 805F894
+ thumb_func_start GetObjectEventIdByXYZ
+GetObjectEventIdByXYZ: @ 805F894
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3582,7 +3582,7 @@ GetFieldObjectIdByXYZ: @ 805F894
lsls r2, 24
lsrs r5, r2, 24
movs r4, 0
- ldr r0, _0805F8E0 @ =gMapObjects
+ ldr r0, _0805F8E0 @ =gObjectEvents
mov r8, r0
_0805F8AC:
lsls r0, r4, 3
@@ -3604,14 +3604,14 @@ _0805F8AC:
bne _0805F8E4
adds r0, r1, 0
adds r1, r5, 0
- bl FieldObjectDoesZCoordMatch
+ bl ObjectEventDoesZCoordMatch
lsls r0, 24
cmp r0, 0
beq _0805F8E4
adds r0, r4, 0
b _0805F8F0
.align 2, 0
-_0805F8E0: .4byte gMapObjects
+_0805F8E0: .4byte gObjectEvents
_0805F8E4:
adds r0, r4, 0x1
lsls r0, 24
@@ -3625,10 +3625,10 @@ _0805F8F0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectIdByXYZ
+ thumb_func_end GetObjectEventIdByXYZ
- thumb_func_start FieldObjectDoesZCoordMatch
-FieldObjectDoesZCoordMatch: @ 805F8FC
+ thumb_func_start ObjectEventDoesZCoordMatch
+ObjectEventDoesZCoordMatch: @ 805F8FC
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -3650,10 +3650,10 @@ _0805F91C:
_0805F91E:
pop {r1}
bx r1
- thumb_func_end FieldObjectDoesZCoordMatch
+ thumb_func_end ObjectEventDoesZCoordMatch
- thumb_func_start UpdateFieldObjectsForCameraUpdate
-UpdateFieldObjectsForCameraUpdate: @ 805F924
+ thumb_func_start UpdateObjectEventsForCameraUpdate
+UpdateObjectEventsForCameraUpdate: @ 805F924
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -3661,7 +3661,7 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
- bl UpdateFieldObjectCoordsForCameraUpdate
+ bl UpdateObjectEventCoordsForCameraUpdate
lsls r4, 16
asrs r4, 16
lsls r5, 16
@@ -3669,11 +3669,11 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
adds r0, r4, 0
adds r1, r5, 0
bl sub_805EC30
- bl RemoveFieldObjectsOutsideView
+ bl RemoveObjectEventsOutsideView
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end UpdateFieldObjectsForCameraUpdate
+ thumb_func_end UpdateObjectEventsForCameraUpdate
thumb_func_start AddCameraObject
AddCameraObject: @ 805F950
@@ -4040,8 +4040,8 @@ _0805FBD2:
bx r1
thumb_func_end obj_unfreeze
- thumb_func_start FieldObjectSetDirection
-FieldObjectSetDirection: @ 805FBDC
+ thumb_func_start ObjectEventSetDirection
+ObjectEventSetDirection: @ 805FBDC
push {r4,lr}
adds r3, r0, 0
lsls r1, 24
@@ -4076,10 +4076,10 @@ _0805FC0C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end FieldObjectSetDirection
+ thumb_func_end ObjectEventSetDirection
- thumb_func_start GetFieldObjectScriptPointerByLocalIdAndMap
-GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20
+ thumb_func_start GetObjectEventScriptPointerByLocalIdAndMap
+GetObjectEventScriptPointerByLocalIdAndMap: @ 805FC20
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4087,18 +4087,18 @@ GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl GetFieldObjectTemplateByLocalIdAndMap
+ bl GetObjectEventTemplateByLocalIdAndMap
ldr r0, [r0, 0x10]
pop {r1}
bx r1
- thumb_func_end GetFieldObjectScriptPointerByLocalIdAndMap
+ thumb_func_end GetObjectEventScriptPointerByLocalIdAndMap
- thumb_func_start GetFieldObjectScriptPointerByFieldObjectId
-GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38
+ thumb_func_start GetObjectEventScriptPointerByObjectEventId
+GetObjectEventScriptPointerByObjectEventId: @ 805FC38
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r1, _0805FC58 @ =gMapObjects
+ ldr r1, _0805FC58 @ =gObjectEvents
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -4106,15 +4106,15 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38
ldrb r0, [r2, 0x8]
ldrb r1, [r2, 0x9]
ldrb r2, [r2, 0xA]
- bl GetFieldObjectScriptPointerByLocalIdAndMap
+ bl GetObjectEventScriptPointerByLocalIdAndMap
pop {r1}
bx r1
.align 2, 0
-_0805FC58: .4byte gMapObjects
- thumb_func_end GetFieldObjectScriptPointerByFieldObjectId
+_0805FC58: .4byte gObjectEvents
+ thumb_func_end GetObjectEventScriptPointerByObjectEventId
- thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap
-GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C
+ thumb_func_start GetObjectEventFlagIdByLocalIdAndMap
+GetObjectEventFlagIdByLocalIdAndMap: @ 805FC5C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4122,18 +4122,18 @@ GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl GetFieldObjectTemplateByLocalIdAndMap
+ bl GetObjectEventTemplateByLocalIdAndMap
ldrh r0, [r0, 0x14]
pop {r1}
bx r1
- thumb_func_end GetFieldObjectFlagIdByLocalIdAndMap
+ thumb_func_end GetObjectEventFlagIdByLocalIdAndMap
- thumb_func_start GetFieldObjectFlagIdByFieldObjectId
-GetFieldObjectFlagIdByFieldObjectId: @ 805FC74
+ thumb_func_start GetObjectEventFlagIdByObjectEventId
+GetObjectEventFlagIdByObjectEventId: @ 805FC74
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r1, _0805FC98 @ =gMapObjects
+ ldr r1, _0805FC98 @ =gObjectEvents
lsls r2, r0, 3
adds r2, r0
lsls r2, 2
@@ -4141,14 +4141,14 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74
ldrb r0, [r2, 0x8]
ldrb r1, [r2, 0x9]
ldrb r2, [r2, 0xA]
- bl GetFieldObjectFlagIdByLocalIdAndMap
+ bl GetObjectEventFlagIdByLocalIdAndMap
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
-_0805FC98: .4byte gMapObjects
- thumb_func_end GetFieldObjectFlagIdByFieldObjectId
+_0805FC98: .4byte gObjectEvents
+ thumb_func_end GetObjectEventFlagIdByObjectEventId
thumb_func_start sub_805FC9C
sub_805FC9C: @ 805FC9C
@@ -4161,11 +4161,11 @@ sub_805FC9C: @ 805FC9C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FCD0
- ldr r2, _0805FCCC @ =gMapObjects
+ ldr r2, _0805FCCC @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -4175,7 +4175,7 @@ sub_805FC9C: @ 805FC9C
ldrb r0, [r0, 0x7]
b _0805FCD2
.align 2, 0
-_0805FCCC: .4byte gMapObjects
+_0805FCCC: .4byte gObjectEvents
_0805FCD0:
movs r0, 0xFF
_0805FCD2:
@@ -4193,7 +4193,7 @@ sub_805FCD8: @ 805FCD8
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl GetFieldObjectTemplateByLocalIdAndMap
+ bl GetObjectEventTemplateByLocalIdAndMap
ldrh r0, [r0, 0xC]
pop {r1}
bx r1
@@ -4203,7 +4203,7 @@ sub_805FCD8: @ 805FCD8
sub_805FCF0: @ 805FCF0
lsls r0, 24
lsrs r0, 24
- ldr r2, _0805FD04 @ =gMapObjects
+ ldr r2, _0805FD04 @ =gObjectEvents
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -4211,7 +4211,7 @@ sub_805FCF0: @ 805FCF0
ldrb r0, [r1, 0x7]
bx lr
.align 2, 0
-_0805FD04: .4byte gMapObjects
+_0805FD04: .4byte gObjectEvents
thumb_func_end sub_805FCF0
thumb_func_start sub_805FD08
@@ -4225,11 +4225,11 @@ sub_805FD08: @ 805FD08
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FD3C
- ldr r2, _0805FD38 @ =gMapObjects
+ ldr r2, _0805FD38 @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -4239,7 +4239,7 @@ sub_805FD08: @ 805FD08
ldrb r0, [r0, 0x1D]
b _0805FD3E
.align 2, 0
-_0805FD38: .4byte gMapObjects
+_0805FD38: .4byte gObjectEvents
_0805FD3C:
movs r0, 0xFF
_0805FD3E:
@@ -4248,11 +4248,11 @@ _0805FD3E:
bx r1
thumb_func_end sub_805FD08
- thumb_func_start FieldObjectGetBerryTreeId
-FieldObjectGetBerryTreeId: @ 805FD44
+ thumb_func_start ObjectEventGetBerryTreeId
+ObjectEventGetBerryTreeId: @ 805FD44
lsls r0, 24
lsrs r0, 24
- ldr r2, _0805FD58 @ =gMapObjects
+ ldr r2, _0805FD58 @ =gObjectEvents
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -4260,11 +4260,11 @@ FieldObjectGetBerryTreeId: @ 805FD44
ldrb r0, [r1, 0x1D]
bx lr
.align 2, 0
-_0805FD58: .4byte gMapObjects
- thumb_func_end FieldObjectGetBerryTreeId
+_0805FD58: .4byte gObjectEvents
+ thumb_func_end ObjectEventGetBerryTreeId
- thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
-GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C
+ thumb_func_start GetObjectEventTemplateByLocalIdAndMap
+GetObjectEventTemplateByLocalIdAndMap: @ 805FD5C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -4300,14 +4300,14 @@ _0805FD94:
_0805FDA0:
ldrb r2, [r0]
adds r0, r4, 0
- bl FindFieldObjectTemplateInArrayByLocalId
+ bl FindObjectEventTemplateInArrayByLocalId
pop {r4}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectTemplateByLocalIdAndMap
+ thumb_func_end GetObjectEventTemplateByLocalIdAndMap
- thumb_func_start FindFieldObjectTemplateInArrayByLocalId
-FindFieldObjectTemplateInArrayByLocalId: @ 805FDB0
+ thumb_func_start FindObjectEventTemplateInArrayByLocalId
+FindObjectEventTemplateInArrayByLocalId: @ 805FDB0
push {r4,r5,lr}
adds r5, r1, 0
lsls r0, 24
@@ -4339,7 +4339,7 @@ _0805FDE0:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end FindFieldObjectTemplateInArrayByLocalId
+ thumb_func_end FindObjectEventTemplateInArrayByLocalId
thumb_func_start sub_805FDE8
sub_805FDE8: @ 805FDE8
@@ -4454,7 +4454,7 @@ sub_805FE94: @ 805FE94
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FEC2
@@ -4463,7 +4463,7 @@ sub_805FE94: @ 805FE94
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805FEC8 @ =gMapObjects
+ ldr r1, _0805FEC8 @ =gObjectEvents
adds r0, r1
bl sub_805FE5C
_0805FEC2:
@@ -4471,7 +4471,7 @@ _0805FEC2:
pop {r0}
bx r0
.align 2, 0
-_0805FEC8: .4byte gMapObjects
+_0805FEC8: .4byte gObjectEvents
thumb_func_end sub_805FE94
thumb_func_start npc_paltag_set_load
@@ -4602,14 +4602,14 @@ sub_805FFB4: @ 805FFB4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805FFD0 @ =gMapObjects
+ ldr r2, _0805FFD0 @ =gObjectEvents
adds r0, r2
ldr r2, _0805FFD4 @ =sub_805FFD8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0805FFD0: .4byte gMapObjects
+_0805FFD0: .4byte gObjectEvents
_0805FFD4: .4byte sub_805FFD8
thumb_func_end sub_805FFB4
@@ -4628,14 +4628,14 @@ sub_805FFDC: @ 805FFDC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805FFF8 @ =gMapObjects
+ ldr r2, _0805FFF8 @ =gObjectEvents
adds r0, r2
ldr r2, _0805FFFC @ =sub_8060000
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0805FFF8: .4byte gMapObjects
+_0805FFF8: .4byte gObjectEvents
_0805FFFC: .4byte sub_8060000
thumb_func_end sub_805FFDC
@@ -4667,14 +4667,14 @@ sub_8060020: @ 8060020
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806003C @ =gMapObjects
+ ldr r2, _0806003C @ =gObjectEvents
adds r0, r2
ldr r2, _08060040 @ =sub_8060044
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806003C: .4byte gMapObjects
+_0806003C: .4byte gObjectEvents
_08060040: .4byte sub_8060044
thumb_func_end sub_8060020
@@ -4750,7 +4750,7 @@ sub_80600A4: @ 80600A4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _080600DA
@@ -4769,7 +4769,7 @@ sub_80600E0: @ 80600E0
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _080600F4
@@ -4803,7 +4803,7 @@ sub_8060100: @ 8060100
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
@@ -4899,8 +4899,8 @@ _080601CA:
bx r1
thumb_func_end sub_80601AC
- thumb_func_start FieldObjectIsTrainerAndCloseToPlayer
-FieldObjectIsTrainerAndCloseToPlayer: @ 80601D4
+ thumb_func_start ObjectEventIsTrainerAndCloseToPlayer
+ObjectEventIsTrainerAndCloseToPlayer: @ 80601D4
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -4964,7 +4964,7 @@ _08060246:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end FieldObjectIsTrainerAndCloseToPlayer
+ thumb_func_end ObjectEventIsTrainerAndCloseToPlayer
thumb_func_start GetRegularRunningPastFacingDirection
GetRegularRunningPastFacingDirection: @ 8060250
@@ -5362,7 +5362,7 @@ GetRunningPastFacingDirection: @ 8060504
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
bne _0806051C
@@ -5437,14 +5437,14 @@ sub_806058C: @ 806058C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080605A8 @ =gMapObjects
+ ldr r2, _080605A8 @ =gObjectEvents
adds r0, r2
ldr r2, _080605AC @ =sub_80605B0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080605A8: .4byte gMapObjects
+_080605A8: .4byte gObjectEvents
_080605AC: .4byte sub_80605B0
thumb_func_end sub_806058C
@@ -5521,7 +5521,7 @@ sub_8060610: @ 8060610
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -5543,12 +5543,12 @@ sub_8060654: @ 8060654
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060672
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _0806067A
@@ -5590,7 +5590,7 @@ sub_8060684: @ 8060684
ldrb r1, [r0]
_080606B4:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -5610,14 +5610,14 @@ sub_80606CC: @ 80606CC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080606E8 @ =gMapObjects
+ ldr r2, _080606E8 @ =gObjectEvents
adds r0, r2
ldr r2, _080606EC @ =sub_80606F0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080606E8: .4byte gMapObjects
+_080606E8: .4byte gObjectEvents
_080606EC: .4byte sub_80606F0
thumb_func_end sub_80606CC
@@ -5693,7 +5693,7 @@ sub_8060750: @ 8060750
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _08060786
@@ -5712,7 +5712,7 @@ sub_806078C: @ 806078C
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _080607A0
@@ -5747,7 +5747,7 @@ sub_80607AC: @ 80607AC
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
@@ -5825,14 +5825,14 @@ sub_8060850: @ 8060850
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806086C @ =gMapObjects
+ ldr r2, _0806086C @ =gObjectEvents
adds r0, r2
ldr r2, _08060870 @ =sub_8060874
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806086C: .4byte gMapObjects
+_0806086C: .4byte gObjectEvents
_08060870: .4byte sub_8060874
thumb_func_end sub_8060850
@@ -5908,7 +5908,7 @@ sub_80608D4: @ 80608D4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _0806090A
@@ -5927,7 +5927,7 @@ sub_8060910: @ 8060910
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060924
@@ -5962,7 +5962,7 @@ sub_8060930: @ 8060930
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
@@ -6040,14 +6040,14 @@ sub_80609D4: @ 80609D4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080609F0 @ =gMapObjects
+ ldr r2, _080609F0 @ =gObjectEvents
adds r0, r2
ldr r2, _080609F4 @ =sub_80609F8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080609F0: .4byte gMapObjects
+_080609F0: .4byte gObjectEvents
_080609F4: .4byte sub_80609F8
thumb_func_end sub_80609D4
@@ -6133,14 +6133,14 @@ sub_8060A74: @ 8060A74
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08060A90 @ =gMapObjects
+ ldr r2, _08060A90 @ =gObjectEvents
adds r0, r2
ldr r2, _08060A94 @ =sub_8060A98
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08060A90: .4byte gMapObjects
+_08060A90: .4byte gObjectEvents
_08060A94: .4byte sub_8060A98
thumb_func_end sub_8060A74
@@ -6217,7 +6217,7 @@ sub_8060AF8: @ 8060AF8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6239,12 +6239,12 @@ sub_8060B3C: @ 8060B3C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060B5A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060B62
@@ -6286,7 +6286,7 @@ sub_8060B6C: @ 8060B6C
ldrb r1, [r0]
_08060B9C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6306,14 +6306,14 @@ sub_8060BB4: @ 8060BB4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08060BD0 @ =gMapObjects
+ ldr r2, _08060BD0 @ =gObjectEvents
adds r0, r2
ldr r2, _08060BD4 @ =sub_8060BD8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08060BD0: .4byte gMapObjects
+_08060BD0: .4byte gObjectEvents
_08060BD4: .4byte sub_8060BD8
thumb_func_end sub_8060BB4
@@ -6390,7 +6390,7 @@ sub_8060C38: @ 8060C38
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6412,12 +6412,12 @@ sub_8060C7C: @ 8060C7C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060C9A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060CA2
@@ -6459,7 +6459,7 @@ sub_8060CAC: @ 8060CAC
ldrb r1, [r0]
_08060CDC:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6479,14 +6479,14 @@ sub_8060CF4: @ 8060CF4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08060D10 @ =gMapObjects
+ ldr r2, _08060D10 @ =gObjectEvents
adds r0, r2
ldr r2, _08060D14 @ =sub_8060D18
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08060D10: .4byte gMapObjects
+_08060D10: .4byte gObjectEvents
_08060D14: .4byte sub_8060D18
thumb_func_end sub_8060CF4
@@ -6563,7 +6563,7 @@ sub_8060D78: @ 8060D78
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6585,12 +6585,12 @@ sub_8060DBC: @ 8060DBC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060DDA
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060DE2
@@ -6632,7 +6632,7 @@ sub_8060DEC: @ 8060DEC
ldrb r1, [r0]
_08060E1C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6652,14 +6652,14 @@ sub_8060E34: @ 8060E34
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08060E50 @ =gMapObjects
+ ldr r2, _08060E50 @ =gObjectEvents
adds r0, r2
ldr r2, _08060E54 @ =sub_8060E58
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08060E50: .4byte gMapObjects
+_08060E50: .4byte gObjectEvents
_08060E54: .4byte sub_8060E58
thumb_func_end sub_8060E34
@@ -6736,7 +6736,7 @@ sub_8060EB8: @ 8060EB8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6758,12 +6758,12 @@ sub_8060EFC: @ 8060EFC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _08060F1A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060F22
@@ -6805,7 +6805,7 @@ sub_8060F2C: @ 8060F2C
ldrb r1, [r0]
_08060F5C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6825,14 +6825,14 @@ sub_8060F74: @ 8060F74
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08060F90 @ =gMapObjects
+ ldr r2, _08060F90 @ =gObjectEvents
adds r0, r2
ldr r2, _08060F94 @ =sub_8060F98
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08060F90: .4byte gMapObjects
+_08060F90: .4byte gObjectEvents
_08060F94: .4byte sub_8060F98
thumb_func_end sub_8060F74
@@ -6909,7 +6909,7 @@ sub_8060FF8: @ 8060FF8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6931,12 +6931,12 @@ sub_806103C: @ 806103C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _0806105A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061062
@@ -6978,7 +6978,7 @@ sub_806106C: @ 806106C
ldrb r1, [r0]
_0806109C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6998,14 +6998,14 @@ sub_80610B4: @ 80610B4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080610D0 @ =gMapObjects
+ ldr r2, _080610D0 @ =gObjectEvents
adds r0, r2
ldr r2, _080610D4 @ =sub_80610D8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080610D0: .4byte gMapObjects
+_080610D0: .4byte gObjectEvents
_080610D4: .4byte sub_80610D8
thumb_func_end sub_80610B4
@@ -7082,7 +7082,7 @@ sub_8061138: @ 8061138
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7104,12 +7104,12 @@ sub_806117C: @ 806117C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _0806119A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080611A2
@@ -7151,7 +7151,7 @@ sub_80611AC: @ 80611AC
ldrb r1, [r0]
_080611DC:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7171,14 +7171,14 @@ sub_80611F4: @ 80611F4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061210 @ =gMapObjects
+ ldr r2, _08061210 @ =gObjectEvents
adds r0, r2
ldr r2, _08061214 @ =sub_8061218
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061210: .4byte gMapObjects
+_08061210: .4byte gObjectEvents
_08061214: .4byte sub_8061218
thumb_func_end sub_80611F4
@@ -7255,7 +7255,7 @@ sub_8061278: @ 8061278
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7277,12 +7277,12 @@ sub_80612BC: @ 80612BC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _080612DA
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080612E2
@@ -7324,7 +7324,7 @@ sub_80612EC: @ 80612EC
ldrb r1, [r0]
_0806131C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7344,14 +7344,14 @@ sub_8061334: @ 8061334
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061350 @ =gMapObjects
+ ldr r2, _08061350 @ =gObjectEvents
adds r0, r2
ldr r2, _08061354 @ =sub_8061358
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061350: .4byte gMapObjects
+_08061350: .4byte gObjectEvents
_08061354: .4byte sub_8061358
thumb_func_end sub_8061334
@@ -7428,7 +7428,7 @@ sub_80613B8: @ 80613B8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7450,12 +7450,12 @@ sub_80613FC: @ 80613FC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _0806141A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061422
@@ -7497,7 +7497,7 @@ sub_806142C: @ 806142C
ldrb r1, [r0]
_0806145C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7517,14 +7517,14 @@ sub_8061474: @ 8061474
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061490 @ =gMapObjects
+ ldr r2, _08061490 @ =gObjectEvents
adds r0, r2
ldr r2, _08061494 @ =sub_8061498
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061490: .4byte gMapObjects
+_08061490: .4byte gObjectEvents
_08061494: .4byte sub_8061498
thumb_func_end sub_8061474
@@ -7601,7 +7601,7 @@ sub_80614F8: @ 80614F8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7623,12 +7623,12 @@ sub_806153C: @ 806153C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _0806155A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061562
@@ -7670,7 +7670,7 @@ sub_806156C: @ 806156C
ldrb r1, [r0]
_0806159C:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7690,14 +7690,14 @@ sub_80615B4: @ 80615B4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080615D0 @ =gMapObjects
+ ldr r2, _080615D0 @ =gObjectEvents
adds r0, r2
ldr r2, _080615D4 @ =sub_80615D8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080615D0: .4byte gMapObjects
+_080615D0: .4byte gObjectEvents
_080615D4: .4byte sub_80615D8
thumb_func_end sub_80615B4
@@ -7774,7 +7774,7 @@ sub_8061638: @ 8061638
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7796,12 +7796,12 @@ sub_806167C: @ 806167C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _0806169A
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080616A2
@@ -7843,7 +7843,7 @@ sub_80616AC: @ 80616AC
ldrb r1, [r0]
_080616DC:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7863,14 +7863,14 @@ sub_80616F4: @ 80616F4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061710 @ =gMapObjects
+ ldr r2, _08061710 @ =gObjectEvents
adds r0, r2
ldr r2, _08061714 @ =sub_8061718
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061710: .4byte gMapObjects
+_08061710: .4byte gObjectEvents
_08061714: .4byte sub_8061718
thumb_func_end sub_80616F4
@@ -7926,7 +7926,7 @@ sub_8061764: @ 8061764
beq _0806177E
adds r0, r4, 0
movs r1, 0x30
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_0806177E:
@@ -7942,12 +7942,12 @@ sub_8061788: @ 8061788
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _080617A6
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080617AA
@@ -7985,7 +7985,7 @@ sub_80617B4: @ 80617B4
ldrb r1, [r0]
_080617E0:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8006,14 +8006,14 @@ sub_80617F8: @ 80617F8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061814 @ =gMapObjects
+ ldr r2, _08061814 @ =gObjectEvents
adds r0, r2
ldr r2, _08061818 @ =sub_806181C
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061814: .4byte gMapObjects
+_08061814: .4byte gObjectEvents
_08061818: .4byte sub_806181C
thumb_func_end sub_80617F8
@@ -8069,7 +8069,7 @@ sub_8061868: @ 8061868
beq _08061882
adds r0, r4, 0
movs r1, 0x30
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_08061882:
@@ -8085,12 +8085,12 @@ sub_806188C: @ 806188C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
bne _080618AA
adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
+ bl ObjectEventIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080618AE
@@ -8128,7 +8128,7 @@ sub_80618B8: @ 80618B8
ldrb r1, [r0]
_080618E4:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8149,14 +8149,14 @@ sub_80618FC: @ 80618FC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061918 @ =gMapObjects
+ ldr r2, _08061918 @ =gObjectEvents
adds r0, r2
ldr r2, _0806191C @ =sub_8061920
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061918: .4byte gMapObjects
+_08061918: .4byte gObjectEvents
_0806191C: .4byte sub_8061920
thumb_func_end sub_80618FC
@@ -8196,7 +8196,7 @@ sub_8061954: @ 8061954
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- ldr r0, _08061988 @ =gUnknown_839FD5D
+ ldr r0, _08061988 @ =gInitialMovementTypeFacingDirections
ldrb r1, [r4, 0x6]
adds r1, r0
ldrb r1, [r1]
@@ -8211,7 +8211,7 @@ sub_8061954: @ 8061954
lsrs r1, r0, 24
_08061976:
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8219,7 +8219,7 @@ _08061976:
pop {r1}
bx r1
.align 2, 0
-_08061988: .4byte gUnknown_839FD5D
+_08061988: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8061954
thumb_func_start sub_806198C
@@ -8245,7 +8245,7 @@ sub_806198C: @ 806198C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
_080619BC:
ldrb r1, [r4, 0x18]
lsrs r1, 4
@@ -8272,7 +8272,7 @@ _080619BC:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8345,8 +8345,8 @@ sub_8061A6C: @ 8061A6C
bx r1
thumb_func_end sub_8061A6C
- thumb_func_start MoveFieldObjectInNextDirectionInSequence
-MoveFieldObjectInNextDirectionInSequence: @ 8061A80
+ thumb_func_start MoveObjectEventInNextDirectionInSequence
+MoveObjectEventInNextDirectionInSequence: @ 8061A80
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -8371,7 +8371,7 @@ _08061AA2:
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8392,7 +8392,7 @@ _08061AA2:
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8431,7 +8431,7 @@ _08061B0E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end MoveFieldObjectInNextDirectionInSequence
+ thumb_func_end MoveObjectEventInNextDirectionInSequence
thumb_func_start sub_8061B34
sub_8061B34: @ 8061B34
@@ -8465,14 +8465,14 @@ sub_8061B5C: @ 8061B5C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061B78 @ =gMapObjects
+ ldr r2, _08061B78 @ =gObjectEvents
adds r0, r2
ldr r2, _08061B7C @ =sub_8061B80
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061B78: .4byte gMapObjects
+_08061B78: .4byte gObjectEvents
_08061B7C: .4byte sub_8061B80
thumb_func_end sub_8061B5C
@@ -8522,7 +8522,7 @@ _08061BCC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8542,14 +8542,14 @@ sub_8061BE8: @ 8061BE8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061C04 @ =gMapObjects
+ ldr r2, _08061C04 @ =gObjectEvents
adds r0, r2
ldr r2, _08061C08 @ =sub_8061C0C
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061C04: .4byte gMapObjects
+_08061C04: .4byte gObjectEvents
_08061C08: .4byte sub_8061C0C
thumb_func_end sub_8061BE8
@@ -8599,7 +8599,7 @@ _08061C58:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8619,14 +8619,14 @@ sub_8061C74: @ 8061C74
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061C90 @ =gMapObjects
+ ldr r2, _08061C90 @ =gObjectEvents
adds r0, r2
ldr r2, _08061C94 @ =sub_8061C98
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061C90: .4byte gMapObjects
+_08061C90: .4byte gObjectEvents
_08061C94: .4byte sub_8061C98
thumb_func_end sub_8061C74
@@ -8676,7 +8676,7 @@ _08061CE4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8696,14 +8696,14 @@ sub_8061D00: @ 8061D00
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061D1C @ =gMapObjects
+ ldr r2, _08061D1C @ =gObjectEvents
adds r0, r2
ldr r2, _08061D20 @ =sub_8061D24
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061D1C: .4byte gMapObjects
+_08061D1C: .4byte gObjectEvents
_08061D20: .4byte sub_8061D24
thumb_func_end sub_8061D00
@@ -8753,7 +8753,7 @@ _08061D70:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8773,14 +8773,14 @@ sub_8061D8C: @ 8061D8C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061DA8 @ =gMapObjects
+ ldr r2, _08061DA8 @ =gObjectEvents
adds r0, r2
ldr r2, _08061DAC @ =sub_8061DB0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061DA8: .4byte gMapObjects
+_08061DA8: .4byte gObjectEvents
_08061DAC: .4byte sub_8061DB0
thumb_func_end sub_8061D8C
@@ -8830,7 +8830,7 @@ _08061DFC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8850,14 +8850,14 @@ sub_8061E18: @ 8061E18
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061E34 @ =gMapObjects
+ ldr r2, _08061E34 @ =gObjectEvents
adds r0, r2
ldr r2, _08061E38 @ =sub_8061E3C
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061E34: .4byte gMapObjects
+_08061E34: .4byte gObjectEvents
_08061E38: .4byte sub_8061E3C
thumb_func_end sub_8061E18
@@ -8907,7 +8907,7 @@ _08061E88:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8927,14 +8927,14 @@ sub_8061EA4: @ 8061EA4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061EC0 @ =gMapObjects
+ ldr r2, _08061EC0 @ =gObjectEvents
adds r0, r2
ldr r2, _08061EC4 @ =sub_8061EC8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061EC0: .4byte gMapObjects
+_08061EC0: .4byte gObjectEvents
_08061EC4: .4byte sub_8061EC8
thumb_func_end sub_8061EA4
@@ -8984,7 +8984,7 @@ _08061F14:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9004,14 +9004,14 @@ sub_8061F30: @ 8061F30
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061F4C @ =gMapObjects
+ ldr r2, _08061F4C @ =gObjectEvents
adds r0, r2
ldr r2, _08061F50 @ =sub_8061F54
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061F4C: .4byte gMapObjects
+_08061F4C: .4byte gObjectEvents
_08061F50: .4byte sub_8061F54
thumb_func_end sub_8061F30
@@ -9061,7 +9061,7 @@ _08061FA0:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9081,14 +9081,14 @@ sub_8061FBC: @ 8061FBC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08061FD8 @ =gMapObjects
+ ldr r2, _08061FD8 @ =gObjectEvents
adds r0, r2
ldr r2, _08061FDC @ =sub_8061FE0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08061FD8: .4byte gMapObjects
+_08061FD8: .4byte gObjectEvents
_08061FDC: .4byte sub_8061FE0
thumb_func_end sub_8061FBC
@@ -9138,7 +9138,7 @@ _0806202C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9158,14 +9158,14 @@ sub_8062048: @ 8062048
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062064 @ =gMapObjects
+ ldr r2, _08062064 @ =gObjectEvents
adds r0, r2
ldr r2, _08062068 @ =sub_806206C
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062064: .4byte gMapObjects
+_08062064: .4byte gObjectEvents
_08062068: .4byte sub_806206C
thumb_func_end sub_8062048
@@ -9215,7 +9215,7 @@ _080620B8:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9235,14 +9235,14 @@ sub_80620D4: @ 80620D4
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080620F0 @ =gMapObjects
+ ldr r2, _080620F0 @ =gObjectEvents
adds r0, r2
ldr r2, _080620F4 @ =sub_80620F8
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080620F0: .4byte gMapObjects
+_080620F0: .4byte gObjectEvents
_080620F4: .4byte sub_80620F8
thumb_func_end sub_80620D4
@@ -9292,7 +9292,7 @@ _08062144:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9312,14 +9312,14 @@ sub_8062160: @ 8062160
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806217C @ =gMapObjects
+ ldr r2, _0806217C @ =gObjectEvents
adds r0, r2
ldr r2, _08062180 @ =sub_8062184
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806217C: .4byte gMapObjects
+_0806217C: .4byte gObjectEvents
_08062180: .4byte sub_8062184
thumb_func_end sub_8062160
@@ -9369,7 +9369,7 @@ _080621D0:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9389,14 +9389,14 @@ sub_80621EC: @ 80621EC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062208 @ =gMapObjects
+ ldr r2, _08062208 @ =gObjectEvents
adds r0, r2
ldr r2, _0806220C @ =sub_8062210
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062208: .4byte gMapObjects
+_08062208: .4byte gObjectEvents
_0806220C: .4byte sub_8062210
thumb_func_end sub_80621EC
@@ -9446,7 +9446,7 @@ _0806225C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9466,14 +9466,14 @@ sub_8062278: @ 8062278
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062294 @ =gMapObjects
+ ldr r2, _08062294 @ =gObjectEvents
adds r0, r2
ldr r2, _08062298 @ =sub_806229C
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062294: .4byte gMapObjects
+_08062294: .4byte gObjectEvents
_08062298: .4byte sub_806229C
thumb_func_end sub_8062278
@@ -9523,7 +9523,7 @@ _080622E8:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9543,14 +9543,14 @@ sub_8062304: @ 8062304
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062320 @ =gMapObjects
+ ldr r2, _08062320 @ =gObjectEvents
adds r0, r2
ldr r2, _08062324 @ =sub_8062328
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062320: .4byte gMapObjects
+_08062320: .4byte gObjectEvents
_08062324: .4byte sub_8062328
thumb_func_end sub_8062304
@@ -9600,7 +9600,7 @@ _08062374:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9620,14 +9620,14 @@ sub_8062390: @ 8062390
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080623AC @ =gMapObjects
+ ldr r2, _080623AC @ =gObjectEvents
adds r0, r2
ldr r2, _080623B0 @ =sub_80623B4
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080623AC: .4byte gMapObjects
+_080623AC: .4byte gObjectEvents
_080623B0: .4byte sub_80623B4
thumb_func_end sub_8062390
@@ -9677,7 +9677,7 @@ _08062400:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9697,14 +9697,14 @@ sub_806241C: @ 806241C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062438 @ =gMapObjects
+ ldr r2, _08062438 @ =gObjectEvents
adds r0, r2
ldr r2, _0806243C @ =sub_8062440
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062438: .4byte gMapObjects
+_08062438: .4byte gObjectEvents
_0806243C: .4byte sub_8062440
thumb_func_end sub_806241C
@@ -9754,7 +9754,7 @@ _0806248C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9774,14 +9774,14 @@ sub_80624A8: @ 80624A8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080624C4 @ =gMapObjects
+ ldr r2, _080624C4 @ =gObjectEvents
adds r0, r2
ldr r2, _080624C8 @ =sub_80624CC
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080624C4: .4byte gMapObjects
+_080624C4: .4byte gObjectEvents
_080624C8: .4byte sub_80624CC
thumb_func_end sub_80624A8
@@ -9831,7 +9831,7 @@ _08062518:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9851,14 +9851,14 @@ sub_8062534: @ 8062534
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062550 @ =gMapObjects
+ ldr r2, _08062550 @ =gObjectEvents
adds r0, r2
ldr r2, _08062554 @ =sub_8062558
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062550: .4byte gMapObjects
+_08062550: .4byte gObjectEvents
_08062554: .4byte sub_8062558
thumb_func_end sub_8062534
@@ -9908,7 +9908,7 @@ _080625A4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9928,14 +9928,14 @@ sub_80625C0: @ 80625C0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080625DC @ =gMapObjects
+ ldr r2, _080625DC @ =gObjectEvents
adds r0, r2
ldr r2, _080625E0 @ =sub_80625E4
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080625DC: .4byte gMapObjects
+_080625DC: .4byte gObjectEvents
_080625E0: .4byte sub_80625E4
thumb_func_end sub_80625C0
@@ -9985,7 +9985,7 @@ _08062630:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10005,14 +10005,14 @@ sub_806264C: @ 806264C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062668 @ =gMapObjects
+ ldr r2, _08062668 @ =gObjectEvents
adds r0, r2
ldr r2, _0806266C @ =sub_8062670
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062668: .4byte gMapObjects
+_08062668: .4byte gObjectEvents
_0806266C: .4byte sub_8062670
thumb_func_end sub_806264C
@@ -10062,7 +10062,7 @@ _080626BC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10082,14 +10082,14 @@ sub_80626D8: @ 80626D8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080626F4 @ =gMapObjects
+ ldr r2, _080626F4 @ =gObjectEvents
adds r0, r2
ldr r2, _080626F8 @ =sub_80626FC
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080626F4: .4byte gMapObjects
+_080626F4: .4byte gObjectEvents
_080626F8: .4byte sub_80626FC
thumb_func_end sub_80626D8
@@ -10139,7 +10139,7 @@ _08062748:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10159,14 +10159,14 @@ sub_8062764: @ 8062764
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062780 @ =gMapObjects
+ ldr r2, _08062780 @ =gObjectEvents
adds r0, r2
ldr r2, _08062784 @ =sub_8062788
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062780: .4byte gMapObjects
+_08062780: .4byte gObjectEvents
_08062784: .4byte sub_8062788
thumb_func_end sub_8062764
@@ -10216,7 +10216,7 @@ _080627D4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10236,14 +10236,14 @@ sub_80627F0: @ 80627F0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806280C @ =gMapObjects
+ ldr r2, _0806280C @ =gObjectEvents
adds r0, r2
ldr r2, _08062810 @ =sub_8062814
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806280C: .4byte gMapObjects
+_0806280C: .4byte gObjectEvents
_08062810: .4byte sub_8062814
thumb_func_end sub_80627F0
@@ -10293,7 +10293,7 @@ _08062860:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl MoveFieldObjectInNextDirectionInSequence
+ bl MoveObjectEventInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10313,14 +10313,14 @@ sub_806287C: @ 806287C
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062898 @ =gMapObjects
+ ldr r2, _08062898 @ =gObjectEvents
adds r0, r2
ldr r2, _0806289C @ =sub_80628A0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062898: .4byte gMapObjects
+_08062898: .4byte gObjectEvents
_0806289C: .4byte sub_80628A0
thumb_func_end sub_806287C
@@ -10368,7 +10368,7 @@ sub_80628E4: @ 80628E4
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
- ldr r2, _08062908 @ =gMapObjects
+ ldr r2, _08062908 @ =gObjectEvents
ldr r3, _0806290C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -10385,7 +10385,7 @@ _08062904:
movs r0, 0
b _08062938
.align 2, 0
-_08062908: .4byte gMapObjects
+_08062908: .4byte gObjectEvents
_0806290C: .4byte gPlayerAvatar
_08062910:
ldr r5, _08062940 @ =gUnknown_83A6390
@@ -10449,7 +10449,7 @@ sub_8062970: @ 8062970
adds r5, r1, 0
lsls r2, 24
lsrs r2, 24
- ldr r1, _080629B4 @ =gUnknown_839FD5D
+ ldr r1, _080629B4 @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10475,7 +10475,7 @@ sub_8062970: @ 8062970
pop {r1}
bx r1
.align 2, 0
-_080629B4: .4byte gUnknown_839FD5D
+_080629B4: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8062970
thumb_func_start sub_80629B8
@@ -10489,7 +10489,7 @@ sub_80629B8: @ 80629B8
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062A6C @ =gUnknown_839FD5D
+ ldr r1, _08062A6C @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10505,7 +10505,7 @@ sub_80629B8: @ 80629B8
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
adds r0, r6, 0
bl sub_8063F84
adds r2, r0, 0
@@ -10564,7 +10564,7 @@ _08062A52:
pop {r1}
bx r1
.align 2, 0
-_08062A6C: .4byte gUnknown_839FD5D
+_08062A6C: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_80629B8
thumb_func_start sub_8062A70
@@ -10578,7 +10578,7 @@ sub_8062A70: @ 8062A70
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062B24 @ =gUnknown_839FD5D
+ ldr r1, _08062B24 @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10594,7 +10594,7 @@ sub_8062A70: @ 8062A70
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
adds r0, r6, 0
bl sub_8063FB0
adds r2, r0, 0
@@ -10653,7 +10653,7 @@ _08062B0A:
pop {r1}
bx r1
.align 2, 0
-_08062B24: .4byte gUnknown_839FD5D
+_08062B24: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8062A70
thumb_func_start sub_8062B28
@@ -10667,7 +10667,7 @@ sub_8062B28: @ 8062B28
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062BDC @ =gUnknown_839FD5D
+ ldr r1, _08062BDC @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10683,7 +10683,7 @@ sub_8062B28: @ 8062B28
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
adds r0, r6, 0
bl sub_8064034
adds r2, r0, 0
@@ -10742,7 +10742,7 @@ _08062BC2:
pop {r1}
bx r1
.align 2, 0
-_08062BDC: .4byte gUnknown_839FD5D
+_08062BDC: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8062B28
thumb_func_start sub_8062BE0
@@ -10756,7 +10756,7 @@ sub_8062BE0: @ 8062BE0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062C94 @ =gUnknown_839FD5D
+ ldr r1, _08062C94 @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10772,7 +10772,7 @@ sub_8062BE0: @ 8062BE0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
adds r0, r6, 0
bl sub_8064060
adds r2, r0, 0
@@ -10831,7 +10831,7 @@ _08062C7A:
pop {r1}
bx r1
.align 2, 0
-_08062C94: .4byte gUnknown_839FD5D
+_08062C94: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8062BE0
thumb_func_start cph_IM_DIFFERENT
@@ -10841,7 +10841,7 @@ cph_IM_DIFFERENT: @ 8062C98
adds r5, r1, 0
lsls r2, 24
lsrs r2, 24
- ldr r1, _08062CDC @ =gUnknown_839FD5D
+ ldr r1, _08062CDC @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10867,7 +10867,7 @@ cph_IM_DIFFERENT: @ 8062C98
pop {r1}
bx r1
.align 2, 0
-_08062CDC: .4byte gUnknown_839FD5D
+_08062CDC: .4byte gInitialMovementTypeFacingDirections
thumb_func_end cph_IM_DIFFERENT
thumb_func_start sub_8062CE0
@@ -10881,7 +10881,7 @@ sub_8062CE0: @ 8062CE0
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062D94 @ =gUnknown_839FD5D
+ ldr r1, _08062D94 @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -10897,7 +10897,7 @@ sub_8062CE0: @ 8062CE0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
adds r0, r6, 0
bl sub_8064194
adds r2, r0, 0
@@ -10956,7 +10956,7 @@ _08062D7A:
pop {r1}
bx r1
.align 2, 0
-_08062D94: .4byte gUnknown_839FD5D
+_08062D94: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_8062CE0
thumb_func_start oac_hopping
@@ -10970,7 +10970,7 @@ oac_hopping: @ 8062D98
mov r8, r3
lsls r2, 24
lsrs r6, r2, 24
- ldr r1, _08062E5C @ =gUnknown_839FD5D
+ ldr r1, _08062E5C @ =gInitialMovementTypeFacingDirections
ldrb r0, [r4, 0x6]
adds r0, r1
ldrb r0, [r0]
@@ -11052,7 +11052,7 @@ _08062E40:
pop {r1}
bx r1
.align 2, 0
-_08062E5C: .4byte gUnknown_839FD5D
+_08062E5C: .4byte gInitialMovementTypeFacingDirections
thumb_func_end oac_hopping
thumb_func_start sub_8062E60
@@ -11064,14 +11064,14 @@ sub_8062E60: @ 8062E60
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _08062E7C @ =gMapObjects
+ ldr r2, _08062E7C @ =gObjectEvents
adds r0, r2
ldr r2, _08062E80 @ =sub_8062E84
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_08062E7C: .4byte gMapObjects
+_08062E7C: .4byte gObjectEvents
_08062E80: .4byte sub_8062E84
thumb_func_end sub_8062E60
@@ -11099,7 +11099,7 @@ mss_08062EA4: @ 8062EA4
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
- ldr r2, _08062EC8 @ =gMapObjects
+ ldr r2, _08062EC8 @ =gObjectEvents
ldr r3, _08062ECC @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -11116,7 +11116,7 @@ _08062EC4:
movs r0, 0
b _08062EF8
.align 2, 0
-_08062EC8: .4byte gMapObjects
+_08062EC8: .4byte gObjectEvents
_08062ECC: .4byte gPlayerAvatar
_08062ED0:
ldr r5, _08062F00 @ =gUnknown_83A6390
@@ -11145,8 +11145,8 @@ _08062F00: .4byte gUnknown_83A6390
_08062F04: .4byte MetatileBehavior_IsTallGrass
thumb_func_end mss_08062EA4
- thumb_func_start FieldObjectCB_TreeDisguise
-FieldObjectCB_TreeDisguise: @ 8062F08
+ thumb_func_start ObjectEventCB_TreeDisguise
+ObjectEventCB_TreeDisguise: @ 8062F08
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x2E
@@ -11154,7 +11154,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _08062F6C @ =gMapObjects
+ ldr r0, _08062F6C @ =gObjectEvents
adds r4, r1, r0
adds r6, r4, 0
adds r6, 0x21
@@ -11173,7 +11173,7 @@ _08062F30:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x1C
bl FieldEffectStart
strb r0, [r4, 0x1A]
@@ -11188,19 +11188,19 @@ _08062F50:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08062F6C @ =gMapObjects
+ ldr r1, _08062F6C @ =gObjectEvents
adds r0, r1
ldr r2, _08062F74 @ =sub_8062F78
adds r1, r5, 0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_08062F6C: .4byte gMapObjects
+_08062F6C: .4byte gObjectEvents
_08062F70: .4byte gFieldEffectArguments
_08062F74: .4byte sub_8062F78
- thumb_func_end FieldObjectCB_TreeDisguise
+ thumb_func_end ObjectEventCB_TreeDisguise
thumb_func_start sub_8062F78
sub_8062F78: @ 8062F78
@@ -11211,8 +11211,8 @@ sub_8062F78: @ 8062F78
bx r1
thumb_func_end sub_8062F78
- thumb_func_start FieldObjectCB_MountainDisguise
-FieldObjectCB_MountainDisguise: @ 8062F84
+ thumb_func_start ObjectEventCB_MountainDisguise
+ObjectEventCB_MountainDisguise: @ 8062F84
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x2E
@@ -11220,7 +11220,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _08062FE8 @ =gMapObjects
+ ldr r0, _08062FE8 @ =gObjectEvents
adds r4, r1, r0
adds r6, r4, 0
adds r6, 0x21
@@ -11239,7 +11239,7 @@ _08062FAC:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x1D
bl FieldEffectStart
strb r0, [r4, 0x1A]
@@ -11254,27 +11254,27 @@ _08062FCC:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08062FE8 @ =gMapObjects
+ ldr r1, _08062FE8 @ =gObjectEvents
adds r0, r1
ldr r2, _08062FF0 @ =sub_8062F78
adds r1, r5, 0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_08062FE8: .4byte gMapObjects
+_08062FE8: .4byte gObjectEvents
_08062FEC: .4byte gFieldEffectArguments
_08062FF0: .4byte sub_8062F78
- thumb_func_end FieldObjectCB_MountainDisguise
+ thumb_func_end ObjectEventCB_MountainDisguise
- thumb_func_start FieldObjectCB_Hidden1
-FieldObjectCB_Hidden1: @ 8062FF4
+ thumb_func_start ObjectEventCB_Hidden1
+ObjectEventCB_Hidden1: @ 8062FF4
push {r4,lr}
adds r3, r0, 0
movs r1, 0x3C
ldrsh r0, [r3, r1]
- ldr r4, _08063050 @ =gMapObjects
+ ldr r4, _08063050 @ =gObjectEvents
cmp r0, 0
bne _08063034
movs r0, 0x2E
@@ -11311,14 +11311,14 @@ _08063034:
adds r0, r4
ldr r2, _08063054 @ =sub_8063058
adds r1, r3, 0
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08063050: .4byte gMapObjects
+_08063050: .4byte gObjectEvents
_08063054: .4byte sub_8063058
- thumb_func_end FieldObjectCB_Hidden1
+ thumb_func_end ObjectEventCB_Hidden1
thumb_func_start sub_8063058
sub_8063058: @ 8063058
@@ -11374,14 +11374,14 @@ sub_80630A0: @ 80630A0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080630BC @ =gMapObjects
+ ldr r2, _080630BC @ =gObjectEvents
adds r0, r2
ldr r2, _080630C0 @ =sub_80630C4
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080630BC: .4byte gMapObjects
+_080630BC: .4byte gObjectEvents
_080630C0: .4byte sub_80630C4
thumb_func_end sub_80630A0
@@ -11436,14 +11436,14 @@ sub_8063110: @ 8063110
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806312C @ =gMapObjects
+ ldr r2, _0806312C @ =gObjectEvents
adds r0, r2
ldr r2, _08063130 @ =sub_8063134
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806312C: .4byte gMapObjects
+_0806312C: .4byte gObjectEvents
_08063130: .4byte sub_8063134
thumb_func_end sub_8063110
@@ -11498,14 +11498,14 @@ sub_8063180: @ 8063180
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806319C @ =gMapObjects
+ ldr r2, _0806319C @ =gObjectEvents
adds r0, r2
ldr r2, _080631A0 @ =sub_80631A4
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806319C: .4byte gMapObjects
+_0806319C: .4byte gObjectEvents
_080631A0: .4byte sub_80631A4
thumb_func_end sub_8063180
@@ -11560,14 +11560,14 @@ sub_80631F0: @ 80631F0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0806320C @ =gMapObjects
+ ldr r2, _0806320C @ =gObjectEvents
adds r0, r2
ldr r2, _08063210 @ =sub_8063214
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0806320C: .4byte gMapObjects
+_0806320C: .4byte gObjectEvents
_08063210: .4byte sub_8063214
thumb_func_end sub_80631F0
@@ -11657,14 +11657,14 @@ sub_8063298: @ 8063298
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080632B4 @ =gMapObjects
+ ldr r2, _080632B4 @ =gObjectEvents
adds r0, r2
ldr r2, _080632B8 @ =sub_8063304
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080632B4: .4byte gMapObjects
+_080632B4: .4byte gObjectEvents
_080632B8: .4byte sub_8063304
thumb_func_end sub_8063298
@@ -11677,14 +11677,14 @@ sub_80632BC: @ 80632BC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080632D8 @ =gMapObjects
+ ldr r2, _080632D8 @ =gObjectEvents
adds r0, r2
ldr r2, _080632DC @ =sub_8063324
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080632D8: .4byte gMapObjects
+_080632D8: .4byte gObjectEvents
_080632DC: .4byte sub_8063324
thumb_func_end sub_80632BC
@@ -11697,14 +11697,14 @@ sub_80632E0: @ 80632E0
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _080632FC @ =gMapObjects
+ ldr r2, _080632FC @ =gObjectEvents
adds r0, r2
ldr r2, _08063300 @ =sub_8063344
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_080632FC: .4byte gMapObjects
+_080632FC: .4byte gObjectEvents
_08063300: .4byte sub_8063344
thumb_func_end sub_80632E0
@@ -11885,8 +11885,8 @@ npc_reset: @ 8063410
bx lr
thumb_func_end npc_reset
- thumb_func_start FieldObjectDirectionToImageAnimId
-FieldObjectDirectionToImageAnimId: @ 8063430
+ thumb_func_start ObjectEventDirectionToImageAnimId
+ObjectEventDirectionToImageAnimId: @ 8063430
lsls r0, 24
lsrs r0, 24
ldr r1, _0806343C @ =gUnknown_83A640C
@@ -11895,7 +11895,7 @@ FieldObjectDirectionToImageAnimId: @ 8063430
bx lr
.align 2, 0
_0806343C: .4byte gUnknown_83A640C
- thumb_func_end FieldObjectDirectionToImageAnimId
+ thumb_func_end ObjectEventDirectionToImageAnimId
thumb_func_start get_go_image_anim_num
get_go_image_anim_num: @ 8063440
@@ -12235,7 +12235,7 @@ SetTrainerMovementType: @ 8063610
adds r2, r4, 0
adds r2, 0x1C
adds r0, r2
- ldr r2, _08063658 @ =gUnknown_839FBC8
+ ldr r2, _08063658 @ =gMovementTypeCallbacks
lsls r1, 2
adds r1, r2
ldr r1, [r1]
@@ -12252,7 +12252,7 @@ SetTrainerMovementType: @ 8063610
bx r0
.align 2, 0
_08063654: .4byte gSprites
-_08063658: .4byte gUnknown_839FBC8
+_08063658: .4byte gMovementTypeCallbacks
thumb_func_end SetTrainerMovementType
thumb_func_start GetTrainerFacingDirectionMovementType
@@ -12323,7 +12323,7 @@ npc_block_way: @ 80636AC
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl IsCoordOutsideFieldObjectMovementRect
+ bl IsCoordOutsideObjectEventMovementRect
lsls r0, 24
cmp r0, 0
beq _080636E2
@@ -12384,7 +12384,7 @@ _0806374C:
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl CheckForCollisionBetweenFieldObjects
+ bl CheckForCollisionBetweenObjectEvents
lsls r0, 24
cmp r0, 0
bne _08063760
@@ -12424,7 +12424,7 @@ sub_8063770: @ 8063770
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl IsCoordOutsideFieldObjectMovementRect
+ bl IsCoordOutsideObjectEventMovementRect
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -12486,7 +12486,7 @@ _08063814:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl CheckForCollisionBetweenFieldObjects
+ bl CheckForCollisionBetweenObjectEvents
lsls r0, 24
cmp r0, 0
beq _0806382C
@@ -12505,8 +12505,8 @@ _0806382C:
bx r1
thumb_func_end sub_8063770
- thumb_func_start IsCoordOutsideFieldObjectMovementRect
-IsCoordOutsideFieldObjectMovementRect: @ 806383C
+ thumb_func_start IsCoordOutsideObjectEventMovementRect
+IsCoordOutsideObjectEventMovementRect: @ 806383C
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 16
@@ -12567,7 +12567,7 @@ _080638A6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end IsCoordOutsideFieldObjectMovementRect
+ thumb_func_end IsCoordOutsideObjectEventMovementRect
thumb_func_start IsMetatileDirectionallyImpassable
IsMetatileDirectionallyImpassable: @ 80638AC
@@ -12615,8 +12615,8 @@ _080638FE:
bx r1
thumb_func_end IsMetatileDirectionallyImpassable
- thumb_func_start CheckForCollisionBetweenFieldObjects
-CheckForCollisionBetweenFieldObjects: @ 8063904
+ thumb_func_start CheckForCollisionBetweenObjectEvents
+CheckForCollisionBetweenObjectEvents: @ 8063904
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -12628,7 +12628,7 @@ _08063912:
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
- ldr r1, _08063968 @ =gMapObjects
+ ldr r1, _08063968 @ =gObjectEvents
adds r2, r0, r1
ldrb r0, [r2]
lsls r0, 31
@@ -12669,7 +12669,7 @@ _0806394C:
movs r0, 0x1
b _08063978
.align 2, 0
-_08063968: .4byte gMapObjects
+_08063968: .4byte gObjectEvents
_0806396C:
adds r0, r4, 0x1
lsls r0, 24
@@ -12681,7 +12681,7 @@ _08063978:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end CheckForCollisionBetweenFieldObjects
+ thumb_func_end CheckForCollisionBetweenObjectEvents
thumb_func_start IsBerryTreeSparkling
IsBerryTreeSparkling: @ 8063980
@@ -12694,12 +12694,12 @@ IsBerryTreeSparkling: @ 8063980
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080639CC
ldr r3, _080639C4 @ =gSprites
- ldr r2, _080639C8 @ =gMapObjects
+ ldr r2, _080639C8 @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -12720,7 +12720,7 @@ IsBerryTreeSparkling: @ 8063980
b _080639CE
.align 2, 0
_080639C4: .4byte gSprites
-_080639C8: .4byte gMapObjects
+_080639C8: .4byte gObjectEvents
_080639CC:
movs r0, 0
_080639CE:
@@ -12740,12 +12740,12 @@ sub_80639D4: @ 80639D4
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08063A12
ldr r3, _08063A18 @ =gSprites
- ldr r2, _08063A1C @ =gMapObjects
+ ldr r2, _08063A1C @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -12767,7 +12767,7 @@ _08063A12:
bx r0
.align 2, 0
_08063A18: .4byte gSprites
-_08063A1C: .4byte gMapObjects
+_08063A1C: .4byte gObjectEvents
thumb_func_end sub_80639D4
thumb_func_start MoveCoords
@@ -13039,8 +13039,8 @@ sub_8063BC4: @ 8063BC4
bx r0
thumb_func_end sub_8063BC4
- thumb_func_start GetFieldObjectMovingCameraOffset
-GetFieldObjectMovingCameraOffset: @ 8063C10
+ thumb_func_start GetObjectEventMovingCameraOffset
+GetObjectEventMovingCameraOffset: @ 8063C10
push {lr}
adds r2, r0, 0
movs r0, 0
@@ -13077,10 +13077,10 @@ _08063C48:
bx r0
.align 2, 0
_08063C4C: .4byte gUnknown_3005050
- thumb_func_end GetFieldObjectMovingCameraOffset
+ thumb_func_end GetObjectEventMovingCameraOffset
- thumb_func_start FieldObjectMoveDestCoords
-FieldObjectMoveDestCoords: @ 8063C50
+ thumb_func_start ObjectEventMoveDestCoords
+ObjectEventMoveDestCoords: @ 8063C50
push {r4,lr}
lsls r1, 24
lsrs r1, 24
@@ -13095,10 +13095,10 @@ FieldObjectMoveDestCoords: @ 8063C50
pop {r4}
pop {r0}
bx r0
- thumb_func_end FieldObjectMoveDestCoords
+ thumb_func_end ObjectEventMoveDestCoords
- thumb_func_start FieldObjectIsMovementOverridden
-FieldObjectIsMovementOverridden: @ 8063C70
+ thumb_func_start ObjectEventIsMovementOverridden
+ObjectEventIsMovementOverridden: @ 8063C70
push {lr}
ldrb r1, [r0]
movs r0, 0x42
@@ -13112,10 +13112,10 @@ _08063C80:
_08063C82:
pop {r1}
bx r1
- thumb_func_end FieldObjectIsMovementOverridden
+ thumb_func_end ObjectEventIsMovementOverridden
- thumb_func_start FieldObjectIsSpecialAnimActive
-FieldObjectIsSpecialAnimActive: @ 8063C88
+ thumb_func_start ObjectEventIsSpecialAnimActive
+ObjectEventIsSpecialAnimActive: @ 8063C88
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13132,10 +13132,10 @@ _08063C9E:
_08063CA0:
pop {r1}
bx r1
- thumb_func_end FieldObjectIsSpecialAnimActive
+ thumb_func_end ObjectEventIsSpecialAnimActive
- thumb_func_start FieldObjectSetHeldMovement
-FieldObjectSetHeldMovement: @ 8063CA4
+ thumb_func_start ObjectEventSetHeldMovement
+ObjectEventSetHeldMovement: @ 8063CA4
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 24
@@ -13146,7 +13146,7 @@ FieldObjectSetHeldMovement: @ 8063CA4
cmp r0, 0x1
beq _08063CC8
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08063CCE
@@ -13154,7 +13154,7 @@ FieldObjectSetHeldMovement: @ 8063CA4
b _08063CF4
_08063CC8:
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl ObjectEventClearAnimIfSpecialAnimActive
_08063CCE:
adds r0, r4, 0
bl npc_sync_anim_pause_bits
@@ -13180,25 +13180,25 @@ _08063CF4:
bx r1
.align 2, 0
_08063CFC: .4byte gSprites
- thumb_func_end FieldObjectSetHeldMovement
+ thumb_func_end ObjectEventSetHeldMovement
- thumb_func_start FieldObjectForceSetSpecialAnim
-FieldObjectForceSetSpecialAnim: @ 8063D00
+ thumb_func_start ObjectEventForceSetSpecialAnim
+ObjectEventForceSetSpecialAnim: @ 8063D00
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl ObjectEventClearAnimIfSpecialAnimActive
adds r0, r5, 0
adds r1, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end FieldObjectForceSetSpecialAnim
+ thumb_func_end ObjectEventForceSetSpecialAnim
- thumb_func_start FieldObjectClearAnimIfSpecialAnimActive
-FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C
+ thumb_func_start ObjectEventClearAnimIfSpecialAnimActive
+ObjectEventClearAnimIfSpecialAnimActive: @ 8063D1C
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13206,14 +13206,14 @@ FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C
cmp r0, 0
bge _08063D2E
adds r0, r1, 0
- bl FieldObjectClearAnim
+ bl ObjectEventClearAnim
_08063D2E:
pop {r0}
bx r0
- thumb_func_end FieldObjectClearAnimIfSpecialAnimActive
+ thumb_func_end ObjectEventClearAnimIfSpecialAnimActive
- thumb_func_start FieldObjectClearAnim
-FieldObjectClearAnim: @ 8063D34
+ thumb_func_start ObjectEventClearAnim
+ObjectEventClearAnim: @ 8063D34
movs r1, 0xFF
strb r1, [r0, 0x1C]
ldrb r2, [r0]
@@ -13240,10 +13240,10 @@ FieldObjectClearAnim: @ 8063D34
bx lr
.align 2, 0
_08063D64: .4byte gSprites
- thumb_func_end FieldObjectClearAnim
+ thumb_func_end ObjectEventClearAnim
- thumb_func_start FieldObjectCheckHeldMovementStatus
-FieldObjectCheckHeldMovementStatus: @ 8063D68
+ thumb_func_start ObjectEventCheckHeldMovementStatus
+ObjectEventCheckHeldMovementStatus: @ 8063D68
push {lr}
ldrb r1, [r0]
lsls r0, r1, 25
@@ -13256,13 +13256,13 @@ _08063D76:
_08063D78:
pop {r1}
bx r1
- thumb_func_end FieldObjectCheckHeldMovementStatus
+ thumb_func_end ObjectEventCheckHeldMovementStatus
- thumb_func_start FieldObjectClearHeldMovementIfFinished
-FieldObjectClearHeldMovementIfFinished: @ 8063D7C
+ thumb_func_start ObjectEventClearHeldMovementIfFinished
+ObjectEventClearHeldMovementIfFinished: @ 8063D7C
push {r4,r5,lr}
adds r5, r0, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -13270,16 +13270,16 @@ FieldObjectClearHeldMovementIfFinished: @ 8063D7C
cmp r4, 0x10
beq _08063D96
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl ObjectEventClearAnimIfSpecialAnimActive
_08063D96:
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end FieldObjectClearHeldMovementIfFinished
+ thumb_func_end ObjectEventClearHeldMovementIfFinished
- thumb_func_start FieldObjectGetSpecialAnim
-FieldObjectGetSpecialAnim: @ 8063DA0
+ thumb_func_start ObjectEventGetSpecialAnim
+ObjectEventGetSpecialAnim: @ 8063DA0
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13293,10 +13293,10 @@ _08063DB0:
_08063DB2:
pop {r1}
bx r1
- thumb_func_end FieldObjectGetSpecialAnim
+ thumb_func_end ObjectEventGetSpecialAnim
- thumb_func_start FieldObjectStep
-FieldObjectStep: @ 8063DB8
+ thumb_func_start ObjectEventStep
+ObjectEventStep: @ 8063DB8
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -13306,13 +13306,13 @@ FieldObjectStep: @ 8063DB8
adds r1, r5, 0
bl sub_80679C8
adds r0, r4, 0
- bl FieldObjectIsSpecialAnimActive
+ bl ObjectEventIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08063DE2
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectExecSpecialAnim
+ bl ObjectEventExecSpecialAnim
b _08063DF8
_08063DE2:
ldrb r0, [r4, 0x1]
@@ -13341,11 +13341,11 @@ _08063DF8:
bl sub_80679F8
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectUpdateSubpriority
+ bl ObjectEventUpdateSubpriority
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end FieldObjectStep
+ thumb_func_end ObjectEventStep
thumb_func_start sub_8063E28
sub_8063E28: @ 8063E28
@@ -13357,7 +13357,7 @@ sub_8063E28: @ 8063E28
adds r1, r5, 0
bl sub_80679C8
adds r0, r4, 0
- bl FieldObjectIsSpecialAnimActive
+ bl ObjectEventIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08063E5C
@@ -13410,7 +13410,7 @@ _08063E88:
bl sub_80679F8
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectUpdateSubpriority
+ bl ObjectEventUpdateSubpriority
pop {r4,r5}
pop {r0}
bx r0
@@ -14009,8 +14009,8 @@ _080642B4:
_080642C4: .4byte gUnknown_83A655F
thumb_func_end GetStepInPlaceDelay4AnimId
- thumb_func_start FieldObjectFaceOppositeDirection
-FieldObjectFaceOppositeDirection: @ 80642C8
+ thumb_func_start ObjectEventFaceOppositeDirection
+ObjectEventFaceOppositeDirection: @ 80642C8
push {r4,lr}
adds r4, r0, 0
lsls r0, r1, 24
@@ -14023,13 +14023,13 @@ FieldObjectFaceOppositeDirection: @ 80642C8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
lsrs r0, 24
pop {r4}
pop {r1}
bx r1
- thumb_func_end FieldObjectFaceOppositeDirection
+ thumb_func_end ObjectEventFaceOppositeDirection
thumb_func_start sub_80642F4
sub_80642F4: @ 80642F4
@@ -14340,8 +14340,8 @@ _08064502:
_08064508: .4byte gUnknown_83A65A9
thumb_func_end state_to_direction
- thumb_func_start FieldObjectExecSpecialAnim
-FieldObjectExecSpecialAnim: @ 806450C
+ thumb_func_start ObjectEventExecSpecialAnim
+ObjectEventExecSpecialAnim: @ 806450C
push {r4,lr}
adds r4, r0, 0
ldr r2, _08064540 @ =gUnknown_83A65BC
@@ -14369,7 +14369,7 @@ _08064538:
bx r0
.align 2, 0
_08064540: .4byte gUnknown_83A65BC
- thumb_func_end FieldObjectExecSpecialAnim
+ thumb_func_end ObjectEventExecSpecialAnim
thumb_func_start sub_8064544
sub_8064544: @ 8064544
@@ -14477,7 +14477,7 @@ an_look_any: @ 80645F4
adds r5, r1, 0
lsls r1, r2, 24
lsrs r1, 24
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r4, 0
bl npc_coords_shift_still
ldrb r0, [r4, 0x18]
@@ -14568,7 +14568,7 @@ sub_8064678: @ 8064678
strh r0, [r5]
mov r0, r8
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r4, 0
mov r1, sp
adds r2, r5, 0
@@ -14731,7 +14731,7 @@ sub_80647C0: @ 80647C0
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
@@ -14842,7 +14842,7 @@ sub_8064894: @ 8064894
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
@@ -15249,7 +15249,7 @@ sub_8064B68: @ 8064B68
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
@@ -15675,7 +15675,7 @@ sub_8064E3C: @ 8064E3C
strh r0, [r6]
adds r0, r7, 0
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
mov r1, r8
lsls r0, r1, 1
add r0, sp
@@ -15947,7 +15947,7 @@ _08065072:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -16468,7 +16468,7 @@ sub_80653F8: @ 80653F8
cmp r0, 0x1
beq _0806541A
movs r0, 0x1
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16526,7 +16526,7 @@ sub_8065464: @ 8065464
cmp r0, 0x2
beq _08065486
movs r0, 0x2
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16584,7 +16584,7 @@ sub_80654D0: @ 80654D0
cmp r0, 0x3
beq _080654F2
movs r0, 0x3
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16642,7 +16642,7 @@ sub_806553C: @ 806553C
cmp r0, 0x4
beq _0806555E
movs r0, 0x4
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16696,7 +16696,7 @@ sub_80655A8: @ 80655A8
adds r5, r1, 0
lsls r1, r2, 24
lsrs r1, 24
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r4, 0
bl npc_coords_shift_still
adds r2, r5, 0
@@ -16724,7 +16724,7 @@ sub_80655D4: @ 80655D4
cmp r0, 0x1
beq _080655F6
movs r0, 0x1
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16754,7 +16754,7 @@ sub_8065610: @ 8065610
cmp r0, 0x2
beq _08065632
movs r0, 0x2
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16784,7 +16784,7 @@ sub_806564C: @ 806564C
cmp r0, 0x3
beq _0806566E
movs r0, 0x3
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16814,7 +16814,7 @@ sub_8065688: @ 8065688
cmp r0, 0x4
beq _080656AA
movs r0, 0x4
- bl FieldObjectDirectionToImageAnimId
+ bl ObjectEventDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -16849,7 +16849,7 @@ sub_80656C4: @ 80656C4
lsrs r4, 24
lsls r5, 16
lsrs r5, 16
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
mov r0, r8
adds r1, r6, 0
adds r2, r4, 0
@@ -18002,7 +18002,7 @@ sub_8065EF0: @ 8065EF0
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
@@ -18258,7 +18258,7 @@ npc_set_direction_and_anim__an_proceed: @ 80660C4
bl obj_anim_image_set_and_seek
adds r0, r6, 0
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x1
strh r0, [r5, 0x32]
pop {r4-r6}
@@ -18653,7 +18653,7 @@ sub_806637C: @ 806637C
movs r1, 0
movs r2, 0
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080663C6
@@ -18661,7 +18661,7 @@ sub_806637C: @ 806637C
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
- ldr r4, _080663D4 @ =gMapObjects
+ ldr r4, _080663D4 @ =gObjectEvents
mov r2, sp
ldrb r2, [r2]
lsls r3, r2, 3
@@ -18687,7 +18687,7 @@ _080663C6:
pop {r1}
bx r1
.align 2, 0
-_080663D4: .4byte gMapObjects
+_080663D4: .4byte gObjectEvents
thumb_func_end sub_806637C
thumb_func_start sub_80663D8
@@ -18700,7 +18700,7 @@ sub_80663D8: @ 80663D8
movs r1, 0
movs r2, 0
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0806642A
@@ -18708,7 +18708,7 @@ sub_80663D8: @ 80663D8
ldrsh r0, [r5, r1]
movs r2, 0x12
ldrsh r1, [r5, r2]
- ldr r4, _08066438 @ =gMapObjects
+ ldr r4, _08066438 @ =gObjectEvents
mov r2, sp
ldrb r2, [r2]
lsls r3, r2, 3
@@ -18737,7 +18737,7 @@ _0806642A:
pop {r1}
bx r1
.align 2, 0
-_08066438: .4byte gMapObjects
+_08066438: .4byte gObjectEvents
thumb_func_end sub_80663D8
thumb_func_start sub_806643C
@@ -19354,7 +19354,7 @@ _08066874:
thumb_func_start sub_806687C
sub_806687C: @ 806687C
push {lr}
- ldr r3, _08066890 @ =gUnknown_839FD5D
+ ldr r3, _08066890 @ =gInitialMovementTypeFacingDirections
ldrb r2, [r0, 0x6]
adds r2, r3
ldrb r2, [r2]
@@ -19363,7 +19363,7 @@ sub_806687C: @ 806687C
pop {r1}
bx r1
.align 2, 0
-_08066890: .4byte gUnknown_839FD5D
+_08066890: .4byte gInitialMovementTypeFacingDirections
thumb_func_end sub_806687C
thumb_func_start sub_8066894
@@ -19417,7 +19417,7 @@ sub_80668D4: @ 80668D4
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldrb r1, [r0, 0xC]
lsls r1, 25
lsrs r1, 31
@@ -19466,7 +19466,7 @@ do_exclamation_mark_bubble_1: @ 8066920
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0
bl FieldEffectStart
movs r0, 0x1
@@ -19486,7 +19486,7 @@ do_exclamation_mark_bubble_2: @ 8066944
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x21
bl FieldEffectStart
movs r0, 0x1
@@ -19506,7 +19506,7 @@ do_heart_bubble: @ 8066968
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x2E
bl FieldEffectStart
movs r0, 0x1
@@ -19526,7 +19526,7 @@ sub_806698C: @ 806698C
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x42
bl FieldEffectStart
movs r0, 0x1
@@ -19546,7 +19546,7 @@ sub_80669B0: @ 80669B0
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0x40
bl FieldEffectStart
movs r0, 0x1
@@ -19643,7 +19643,7 @@ sub_8066A54: @ 8066A54
beq _08066A70
adds r0, r4, 0
movs r1, 0x20
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_08066A70:
@@ -19669,7 +19669,7 @@ sub_8066A78: @ 8066A78
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
beq _08066AAA
@@ -19713,7 +19713,7 @@ sub_8066AD0: @ 8066AD0
beq _08066AEC
adds r0, r4, 0
movs r1, 0x20
- bl SetFieldObjectStepTimer
+ bl SetObjectEventStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_08066AEC:
@@ -19739,7 +19739,7 @@ sub_8066AF4: @ 8066AF4
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
- bl RunFieldObjectStepTimer
+ bl RunObjectEventStepTimer
lsls r0, 24
cmp r0, 0
beq _08066B26
@@ -19943,7 +19943,7 @@ sub_8066C70: @ 8066C70
lsls r4, r2, 24
lsrs r4, 24
adds r1, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
adds r0, r5, 0
bl npc_coords_shift_still
adds r0, r4, 0
@@ -21913,7 +21913,7 @@ sub_8067A10: @ 8067A10
ands r0, r1
strb r0, [r5, 0x1]
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r7, r0, 0
adds r0, r4, 0
adds r0, 0x3E
diff --git a/asm/field_camera.s b/asm/field_camera.s
index 0016e6381..cf9fff21d 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -939,7 +939,7 @@ _0805AC54:
bl CameraMove
adds r0, r4, 0
adds r1, r5, 0
- bl UpdateFieldObjectsForCameraUpdate
+ bl UpdateObjectEventsForCameraUpdate
ldr r6, _0805ACA8 @ =gUnknown_3000E90
lsls r4, 1
lsls r5, 1
@@ -987,7 +987,7 @@ sub_805ACB4: @ 805ACB4
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
- bl UpdateFieldObjectsForCameraUpdate
+ bl UpdateObjectEventsForCameraUpdate
bl DrawWholeMapView
ldr r1, _0805ACE8 @ =gUnknown_300506C
lsls r4, 4
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index c0efe9975..85799d9da 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -901,12 +901,12 @@ _0806CF60:
lsrs r1, 16
_0806CF7E:
ldrb r2, [r4, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetObjectEventIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
beq _0806CF9E
- ldr r1, _0806CFA8 @ =gMapObjects
+ ldr r1, _0806CFA8 @ =gObjectEvents
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -920,7 +920,7 @@ _0806CF9E:
b _0806CFDE
.align 2, 0
_0806CFA4: .4byte gDirectionToVectors
-_0806CFA8: .4byte gMapObjects
+_0806CFA8: .4byte gObjectEvents
_0806CFAC:
movs r4, 0
ldr r1, _0806CFE4 @ =gUnknown_2031DEC
@@ -936,7 +936,7 @@ _0806CFBC:
adds r4, 0x1
cmp r4, 0x3
ble _0806CFB0
- ldr r0, _0806CFE8 @ =gSelectedEventObject
+ ldr r0, _0806CFE8 @ =gSelectedObjectEvent
strb r3, [r0]
ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
adds r0, r2, r3
@@ -947,14 +947,14 @@ _0806CFBC:
ldr r0, _0806CFF0 @ =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
- bl GetFieldObjectScriptPointerByFieldObjectId
+ bl GetObjectEventScriptPointerByObjectEventId
_0806CFDE:
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC
-_0806CFE8: .4byte gSelectedEventObject
+_0806CFE8: .4byte gSelectedObjectEvent
_0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CF38
@@ -973,12 +973,12 @@ sub_806CFF4: @ 806CFF4
ldrh r0, [r4]
ldrh r1, [r4, 0x2]
ldrb r2, [r4, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetObjectEventIdByXYZ
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D02A
- ldr r2, _0806D098 @ =gMapObjects
+ ldr r2, _0806D098 @ =gObjectEvents
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1011,12 +1011,12 @@ _0806D02A:
lsls r1, 16
lsrs r1, 16
ldrb r2, [r4, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetObjectEventIdByXYZ
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x10
beq _0806D092
- ldr r2, _0806D098 @ =gMapObjects
+ ldr r2, _0806D098 @ =gObjectEvents
lsls r1, r5, 3
adds r0, r1, r5
lsls r0, 2
@@ -1031,9 +1031,9 @@ _0806D078:
bne _0806D0A0
adds r0, r6, r5
lsls r0, 2
- ldr r1, _0806D098 @ =gMapObjects
+ ldr r1, _0806D098 @ =gObjectEvents
adds r0, r1
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
bne _0806D0A0
@@ -1041,13 +1041,13 @@ _0806D092:
movs r0, 0
b _0806D0C8
.align 2, 0
-_0806D098: .4byte gMapObjects
+_0806D098: .4byte gObjectEvents
_0806D09C: .4byte gDirectionToVectors
_0806D0A0:
- ldr r0, _0806D0D4 @ =gSelectedEventObject
+ ldr r0, _0806D0D4 @ =gSelectedObjectEvent
strb r5, [r0]
ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
- ldr r1, _0806D0DC @ =gMapObjects
+ ldr r1, _0806D0DC @ =gObjectEvents
adds r0, r6, r5
lsls r0, 2
adds r0, r1
@@ -1057,7 +1057,7 @@ _0806D0A0:
mov r1, r8
strh r1, [r0]
adds r0, r5, 0
- bl GetFieldObjectScriptPointerByFieldObjectId
+ bl GetObjectEventScriptPointerByObjectEventId
adds r1, r0, 0
ldrb r0, [r4]
bl GetRamScript
@@ -1069,9 +1069,9 @@ _0806D0C8:
pop {r1}
bx r1
.align 2, 0
-_0806D0D4: .4byte gSelectedEventObject
+_0806D0D4: .4byte gSelectedObjectEvent
_0806D0D8: .4byte gSpecialVar_LastTalked
-_0806D0DC: .4byte gMapObjects
+_0806D0DC: .4byte gObjectEvents
_0806D0E0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CFF4
@@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl FindInvisibleMapObjectByPosition
+ bl FindInvisibleObjectEventByPosition
adds r5, r0, 0
cmp r5, 0
beq _0806D164
@@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl FindInvisibleMapObjectByPosition
+ bl FindInvisibleObjectEventByPosition
cmp r0, 0
bne _0806D950
movs r0, 0
@@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveObjectEventByLocalIdAndMap
ldrb r0, [r5, 0x8]
ldr r2, [r4]
ldrb r1, [r2, 0x5]
@@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4
_0806DEE8: .4byte gMapHeader
thumb_func_end sub_806DEC4
- thumb_func_start FindInvisibleMapObjectByPosition
-FindInvisibleMapObjectByPosition: @ 806DEEC
+ thumb_func_start FindInvisibleObjectEventByPosition
+FindInvisibleObjectEventByPosition: @ 806DEEC
push {r4-r7,lr}
lsls r1, 16
lsrs r7, r1, 16
@@ -2938,7 +2938,7 @@ _0806DF34:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end FindInvisibleMapObjectByPosition
+ thumb_func_end FindInvisibleObjectEventByPosition
thumb_func_start dive_warp
dive_warp: @ 806DF3C
@@ -3079,8 +3079,8 @@ _0806E046:
bx r1
thumb_func_end sub_806DFB8
- thumb_func_start GetFieldObjectScriptPointerForComparison
-GetFieldObjectScriptPointerForComparison: @ 806E050
+ thumb_func_start GetObjectEventScriptPointerForComparison
+GetObjectEventScriptPointerForComparison: @ 806E050
push {r4,r5,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
@@ -3106,7 +3106,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectScriptPointerForComparison
+ thumb_func_end GetObjectEventScriptPointerForComparison
thumb_func_start SetCableClubWarp
SetCableClubWarp: @ 806E08C
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 41c33c6fc..bc2a2fceb 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1989,7 +1989,7 @@ mapldr_080842E8: @ 80842E8
movs r1, 0
bl CreateTask
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390
ldr r0, _080843E8 @ =c3_080843F8
movs r1, 0
bl CreateTask
- ldr r4, _080843EC @ =gMapObjects
+ ldr r4, _080843EC @ =gObjectEvents
ldr r3, _080843F0 @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -2089,10 +2089,10 @@ mapldr_08084390: @ 8084390
lsls r0, 2
adds r0, r4
movs r1, 0x3
- bl FieldObjectTurn
+ bl ObjectEventTurn
_080843D2:
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2101,7 +2101,7 @@ _080843D2:
bx r0
.align 2, 0
_080843E8: .4byte c3_080843F8
-_080843EC: .4byte gMapObjects
+_080843EC: .4byte gObjectEvents
_080843F0: .4byte gPlayerAvatar
_080843F4: .4byte gFieldCallback
thumb_func_end mapldr_08084390
@@ -2139,7 +2139,7 @@ _0808442A:
cmp r0, 0
bne _08084444
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
adds r0, r5, 0
bl DestroyTask
_08084444:
@@ -2158,7 +2158,7 @@ sub_8084454: @ 8084454
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
@@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
- ldr r0, _0808455C @ =gMapObjects
+ ldr r0, _0808455C @ =gObjectEvents
mov r8, r0
add r5, r8
ldrb r0, [r6, 0x4]
@@ -2243,7 +2243,7 @@ sub_80844BC: @ 80844BC
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
adds r3, r4, 0
adds r3, 0x42
ldrb r0, [r3]
@@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC
bx r1
.align 2, 0
_08084558: .4byte gPlayerAvatar
-_0808455C: .4byte gMapObjects
+_0808455C: .4byte gObjectEvents
_08084560: .4byte gSprites
thumb_func_end sub_80844BC
@@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580
movs r0, 0x1
strh r0, [r5, 0xA]
strh r1, [r5, 0xC]
- ldr r2, _080845F0 @ =gMapObjects
+ ldr r2, _080845F0 @ =gObjectEvents
ldrb r0, [r6, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580
_080845E4: .4byte gPlayerAvatar
_080845E8: .4byte gSprites
_080845EC: .4byte gSpriteCoordOffsetY
-_080845F0: .4byte gMapObjects
+_080845F0: .4byte gObjectEvents
thumb_func_end sub_8084580
thumb_func_start sub_80845F4
@@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080846A4 @ =gMapObjects
+ ldr r1, _080846A4 @ =gObjectEvents
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -2450,7 +2450,7 @@ _08084698:
bx r1
.align 2, 0
_080846A0: .4byte gPlayerAvatar
-_080846A4: .4byte gMapObjects
+_080846A4: .4byte gObjectEvents
_080846A8: .4byte gSprites
thumb_func_end sub_80845F4
@@ -2516,7 +2516,7 @@ sub_8084708: @ 8084708
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
bl CameraObjectReset1
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
bl InstallCameraPanAheadCallback
mov r4, sp
adds r4, 0x2
@@ -2626,7 +2626,7 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8
push {r4,lr}
adds r4, r0, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_809C448
@@ -2650,15 +2650,15 @@ sub_8084820: @ 8084820
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0808488C @ =gMapObjects
+ ldr r1, _0808488C @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808484A
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808487E
@@ -2671,7 +2671,7 @@ _0808484A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
movs r1, 0
@@ -2693,7 +2693,7 @@ _0808487E:
bx r1
.align 2, 0
_08084888: .4byte gPlayerAvatar
-_0808488C: .4byte gMapObjects
+_0808488C: .4byte gObjectEvents
thumb_func_end sub_8084820
thumb_func_start sub_8084890
@@ -2889,7 +2889,7 @@ sub_80849F4: @ 80849F4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
@@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08084AC0 @ =gMapObjects
+ ldr r0, _08084AC0 @ =gObjectEvents
adds r4, r0
movs r0, 0x4
bl sub_8063EB8
@@ -2952,7 +2952,7 @@ sub_8084A5C: @ 8084A5C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
mov r4, sp
adds r4, 0x2
mov r0, sp
@@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C
b _08084AC6
.align 2, 0
_08084ABC: .4byte gPlayerAvatar
-_08084AC0: .4byte gMapObjects
+_08084AC0: .4byte gObjectEvents
_08084AC4:
movs r1, 0
_08084AC6:
@@ -3189,23 +3189,23 @@ sub_8084C3C: @ 8084C3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08084C98 @ =gMapObjects
+ ldr r1, _08084C98 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08084C8A
bl CameraObjectReset1
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
movs r0, 0x4
bl sub_8063F84
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldr r0, _08084C9C @ =sub_8084A24
bl FindTaskIdByFunc
lsls r0, 24
@@ -3220,7 +3220,7 @@ _08084C8A:
bx r1
.align 2, 0
_08084C94: .4byte gPlayerAvatar
-_08084C98: .4byte gMapObjects
+_08084C98: .4byte gObjectEvents
_08084C9C: .4byte sub_8084A24
thumb_func_end sub_8084C3C
@@ -3273,7 +3273,7 @@ _08084CEA:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _08084D20 @ =gMapObjects
+ ldr r0, _08084D20 @ =gObjectEvents
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3288,7 +3288,7 @@ _08084CEA:
_08084D14: .4byte gUnknown_83CC084
_08084D18: .4byte gTasks
_08084D1C: .4byte gPlayerAvatar
-_08084D20: .4byte gMapObjects
+_08084D20: .4byte gObjectEvents
thumb_func_end sub_8084CD8
thumb_func_start sub_8084D24
@@ -3317,12 +3317,12 @@ waterfall_1_do_anim_probably: @ 8084D44
adds r5, r1, 0
bl ScriptContext2_Enable
adds r0, r5, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _08084D74
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
ldr r1, _08084D7C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -3374,7 +3374,7 @@ sub_8084DA4: @ 8084DA4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _08084DE2
@@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4
lsls r0, 24
cmp r0, 0
bne _08084F18
- ldr r2, _08084F20 @ =gMapObjects
+ ldr r2, _08084F20 @ =gObjectEvents
ldr r0, _08084F24 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -3560,7 +3560,7 @@ _08084F18:
pop {r1}
bx r1
.align 2, 0
-_08084F20: .4byte gMapObjects
+_08084F20: .4byte gObjectEvents
_08084F24: .4byte gPlayerAvatar
_08084F28: .4byte sub_8084E60
thumb_func_end dive_3_unknown
@@ -3600,7 +3600,7 @@ _08084F58:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _08084F98 @ =gMapObjects
+ ldr r0, _08084F98 @ =gObjectEvents
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3621,7 +3621,7 @@ _08084F58:
_08084F8C: .4byte gUnknown_83CC0A4
_08084F90: .4byte gTasks
_08084F94: .4byte gPlayerAvatar
-_08084F98: .4byte gMapObjects
+_08084F98: .4byte gObjectEvents
_08084F9C: .4byte gSprites
thumb_func_end sub_8084F44
@@ -3630,7 +3630,7 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
@@ -3946,7 +3946,7 @@ _080851FC:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _0808523C @ =gMapObjects
+ ldr r0, _0808523C @ =gObjectEvents
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -3967,7 +3967,7 @@ _080851FC:
_08085230: .4byte gUnknown_83CC0BC
_08085234: .4byte gTasks
_08085238: .4byte gPlayerAvatar
-_0808523C: .4byte gMapObjects
+_0808523C: .4byte gObjectEvents
_08085240: .4byte gSprites
thumb_func_end sub_80851E8
@@ -3977,7 +3977,7 @@ sub_8085244: @ 8085244
adds r5, r0, 0
adds r4, r1, 0
bl CameraObjectReset2
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4070,7 +4070,7 @@ sub_80852C0: @ 80852C0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
_08085308:
movs r0, 0
pop {r4}
@@ -4084,7 +4084,7 @@ _08085310: .4byte gSprites
sub_8085314: @ 8085314
push {lr}
adds r0, r1, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808533E
@@ -4092,7 +4092,7 @@ sub_8085314: @ 8085314
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
ldr r0, _08085348 @ =sub_80851E8
bl FindTaskIdByFunc
lsls r0, 24
@@ -4116,7 +4116,7 @@ FldEff_LavaridgeGymWarp: @ 808534C
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080853A8 @ =gUnknown_83A0010
+ ldr r0, _080853A8 @ =gFieldEffectObjectTemplatePointers
adds r0, 0x84
ldr r0, [r0]
movs r2, 0
@@ -4152,7 +4152,7 @@ FldEff_LavaridgeGymWarp: @ 808534C
bx r1
.align 2, 0
_080853A4: .4byte gFieldEffectArguments
-_080853A8: .4byte gUnknown_83A0010
+_080853A8: .4byte gFieldEffectObjectTemplatePointers
_080853AC: .4byte gSprites
thumb_func_end FldEff_LavaridgeGymWarp
@@ -4209,7 +4209,7 @@ _080853F8:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _08085438 @ =gMapObjects
+ ldr r0, _08085438 @ =gObjectEvents
adds r1, r0
ldrb r0, [r5, 0x4]
lsls r2, r0, 4
@@ -4230,7 +4230,7 @@ _080853F8:
_0808542C: .4byte gUnknown_83CC0CC
_08085430: .4byte gTasks
_08085434: .4byte gPlayerAvatar
-_08085438: .4byte gMapObjects
+_08085438: .4byte gObjectEvents
_0808543C: .4byte gSprites
thumb_func_end sub_80853E4
@@ -4239,7 +4239,7 @@ sub_8085440: @ 8085440
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1
@@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470
adds r4, r1, 0
adds r6, r2, 0
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080854E4
@@ -4311,7 +4311,7 @@ _080854C4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
movs r0, 0x21
bl PlaySE
_080854E4:
@@ -4420,7 +4420,7 @@ FldEff_PopOutOfAsh: @ 80855A0
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080855FC @ =gUnknown_83A0010
+ ldr r0, _080855FC @ =gFieldEffectObjectTemplatePointers
adds r0, 0x80
ldr r0, [r0]
movs r2, 0
@@ -4456,7 +4456,7 @@ FldEff_PopOutOfAsh: @ 80855A0
bx r1
.align 2, 0
_080855F8: .4byte gFieldEffectArguments
-_080855FC: .4byte gUnknown_83A0010
+_080855FC: .4byte gFieldEffectObjectTemplatePointers
_08085600: .4byte gSprites
thumb_func_end FldEff_PopOutOfAsh
@@ -4482,7 +4482,7 @@ _0808561C:
sub_8085620: @ 8085620
push {lr}
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50
bl CreateTask
@@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080856D8 @ =gMapObjects
+ ldr r1, _080856D8 @ =gObjectEvents
adds r6, r0, r1
adds r4, r5, 0
adds r4, 0x8
@@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690
b _08085702
.align 2, 0
_080856D4: .4byte gPlayerAvatar
-_080856D8: .4byte gMapObjects
+_080856D8: .4byte gObjectEvents
_080856DC:
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -4610,7 +4610,7 @@ _08085702:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
bl sub_80555E0
bl WarpIntoMap
ldr r1, _0808575C @ =gFieldCallback
@@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C
adds r4, r0, 0
adds r6, r1, 0
adds r5, r2, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808578A
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080857E4
@@ -4673,7 +4673,7 @@ _0808579E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r1, [r5]
movs r2, 0
ldrsh r0, [r5, r2]
@@ -4969,11 +4969,11 @@ sub_80859D4: @ 80859D4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
- ldr r2, _08085A18 @ =gMapObjects
+ ldr r2, _08085A18 @ =gObjectEvents
ldr r0, _08085A1C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4
bx r0
.align 2, 0
_08085A14: .4byte gFieldCallback
-_08085A18: .4byte gMapObjects
+_08085A18: .4byte gObjectEvents
_08085A1C: .4byte gPlayerAvatar
_08085A20: .4byte sub_8085A24
thumb_func_end sub_80859D4
@@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08085AD8 @ =gMapObjects
+ ldr r1, _08085AD8 @ =gObjectEvents
adds r6, r0, r1
adds r1, r4, 0
adds r1, 0xA
@@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80
b _08085B10
.align 2, 0
_08085AD4: .4byte gPlayerAvatar
-_08085AD8: .4byte gMapObjects
+_08085AD8: .4byte gObjectEvents
_08085ADC:
movs r2, 0xE
ldrsh r0, [r5, r2]
@@ -5125,7 +5125,7 @@ _08085B10:
cmp r1, r0
bne _08085B58
adds r0, r6, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5141,7 +5141,7 @@ _08085B10:
ands r0, r1
strb r0, [r6, 0x3]
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
ldr r0, _08085B60 @ =sub_8085A24
bl FindTaskIdByFunc
lsls r0, 24
@@ -5198,7 +5198,7 @@ sub_8085BA8: @ 8085BA8
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
bl GetPlayerFacingDirection
lsls r0, 24
@@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08085C5C @ =gMapObjects
+ ldr r1, _08085C5C @ =gObjectEvents
adds r5, r0, r1
ldrh r1, [r4, 0xA]
movs r2, 0xA
@@ -5245,7 +5245,7 @@ _08085C02:
add r0, sp
ldrb r1, [r0]
adds r0, r5, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
movs r0, 0x8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xC]
@@ -5282,7 +5282,7 @@ _08085C4A:
.align 2, 0
_08085C54: .4byte gUnknown_83CC108
_08085C58: .4byte gPlayerAvatar
-_08085C5C: .4byte gMapObjects
+_08085C5C: .4byte gObjectEvents
thumb_func_end sub_8085BD0
thumb_func_start sub_8085C60
@@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08085D2C @ =gMapObjects
+ ldr r1, _08085D2C @ =gObjectEvents
adds r3, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5321,7 +5321,7 @@ sub_8085C60: @ 8085C60
add r0, sp
ldrb r1, [r0]
adds r0, r3, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
_08085CAA:
ldrh r0, [r5, 0x22]
ldrh r1, [r4, 0xE]
@@ -5387,7 +5387,7 @@ _08085D1A:
.align 2, 0
_08085D24: .4byte gUnknown_83CC108
_08085D28: .4byte gPlayerAvatar
-_08085D2C: .4byte gMapObjects
+_08085D2C: .4byte gObjectEvents
_08085D30: .4byte gSprites
thumb_func_end sub_8085C60
@@ -5435,11 +5435,11 @@ mapldr_08085D88: @ 8085D88
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
- ldr r2, _08085DD0 @ =gMapObjects
+ ldr r2, _08085DD0 @ =gObjectEvents
ldr r0, _08085DD4 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88
bx r0
.align 2, 0
_08085DCC: .4byte gFieldCallback
-_08085DD0: .4byte gMapObjects
+_08085DD0: .4byte gObjectEvents
_08085DD4: .4byte gPlayerAvatar
_08085DD8: .4byte sub_8085DDC
thumb_func_end mapldr_08085D88
@@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C
adds r0, r1
negs r0, r0
strh r0, [r2, 0x26]
- ldr r3, _08085E94 @ =gMapObjects
+ ldr r3, _08085E94 @ =gObjectEvents
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
adds r1, r0
@@ -5554,7 +5554,7 @@ _08085E82:
_08085E88: .4byte gPlayerAvatar
_08085E8C: .4byte gSprites
_08085E90: .4byte gSpriteCoordOffsetY
-_08085E94: .4byte gMapObjects
+_08085E94: .4byte gObjectEvents
thumb_func_end sub_8085E0C
thumb_func_start sub_8085E98
@@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08085F08 @ =gMapObjects
+ ldr r1, _08085F08 @ =gObjectEvents
adds r6, r0, r1
ldrb r1, [r2, 0x4]
lsls r0, r1, 4
@@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98
.align 2, 0
_08085F00: .4byte gUnknown_83CC108
_08085F04: .4byte gPlayerAvatar
-_08085F08: .4byte gMapObjects
+_08085F08: .4byte gObjectEvents
_08085F0C: .4byte gSprites
_08085F10:
ldrb r1, [r5, 0x5]
@@ -5670,7 +5670,7 @@ _08085F5A:
add r0, sp
ldrb r1, [r0]
adds r0, r6, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
_08085F7C:
movs r1, 0x26
ldrsh r0, [r5, r1]
@@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086020 @ =gMapObjects
+ ldr r1, _08086020 @ =gObjectEvents
adds r5, r0, r1
ldrh r0, [r4, 0xA]
subs r0, 0x1
@@ -5718,7 +5718,7 @@ sub_8085F9C: @ 8085F9C
add r0, sp
ldrb r1, [r0]
adds r0, r5, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
movs r0, 0x8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xC]
@@ -5737,7 +5737,7 @@ sub_8085F9C: @ 8085F9C
bne _08086010
bl ScriptContext2_Disable
bl CameraObjectReset1
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
ldr r0, _08086024 @ =sub_8085DDC
bl FindTaskIdByFunc
lsls r0, 24
@@ -5751,7 +5751,7 @@ _08086010:
.align 2, 0
_08086018: .4byte gUnknown_83CC108
_0808601C: .4byte gPlayerAvatar
-_08086020: .4byte gMapObjects
+_08086020: .4byte gObjectEvents
_08086024: .4byte sub_8085DDC
thumb_func_end sub_8085F9C
@@ -7000,7 +7000,7 @@ sub_80869C0: @ 80869C0
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
@@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0
adds r0, r6, 0
mov r1, r8
bl PlayerGetDestCoords
- ldr r2, _08086A1C @ =gMapObjects
+ ldr r2, _08086A1C @ =gObjectEvents
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0
bx r0
.align 2, 0
_08086A18: .4byte gPlayerAvatar
-_08086A1C: .4byte gMapObjects
+_08086A1C: .4byte gObjectEvents
thumb_func_end sub_80869C0
thumb_func_start sub_8086A20
@@ -7047,15 +7047,15 @@ sub_8086A20: @ 8086A20
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086A68 @ =gMapObjects
+ ldr r1, _08086A68 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086A4A
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086A5C
@@ -7063,7 +7063,7 @@ _08086A4A:
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7073,7 +7073,7 @@ _08086A5C:
bx r0
.align 2, 0
_08086A64: .4byte gPlayerAvatar
-_08086A68: .4byte gMapObjects
+_08086A68: .4byte gObjectEvents
thumb_func_end sub_8086A20
thumb_func_start sub_8086A6C
@@ -7085,9 +7085,9 @@ sub_8086A6C: @ 8086A6C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086AAC @ =gMapObjects
+ ldr r1, _08086AAC @ =gObjectEvents
adds r0, r1
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _08086AA2
@@ -7109,7 +7109,7 @@ _08086AA2:
bx r0
.align 2, 0
_08086AA8: .4byte gPlayerAvatar
-_08086AAC: .4byte gMapObjects
+_08086AAC: .4byte gObjectEvents
_08086AB0: .4byte gFieldEffectArguments
thumb_func_end sub_8086A6C
@@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08086B28 @ =gMapObjects
+ ldr r0, _08086B28 @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7135,9 +7135,9 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_80641C0
@@ -7145,7 +7145,7 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldr r1, _08086B2C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r6, r2]
@@ -7167,7 +7167,7 @@ _08086B1E:
bx r0
.align 2, 0
_08086B24: .4byte gPlayerAvatar
-_08086B28: .4byte gMapObjects
+_08086B28: .4byte gObjectEvents
_08086B2C: .4byte gFieldEffectArguments
thumb_func_end sub_8086AB4
@@ -7179,10 +7179,10 @@ sub_8086B30: @ 8086B30
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086BA0 @ =gMapObjects
+ ldr r1, _08086BA0 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086B96
@@ -7199,11 +7199,11 @@ sub_8086B30: @ 8086B30
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
bl ScriptContext2_Disable
movs r0, 0x9
bl FieldEffectActiveListRemove
@@ -7220,7 +7220,7 @@ _08086B96:
bx r0
.align 2, 0
_08086B9C: .4byte gPlayerAvatar
-_08086BA0: .4byte gMapObjects
+_08086BA0: .4byte gObjectEvents
_08086BA4: .4byte sub_8086990
thumb_func_end sub_8086B30
@@ -7276,7 +7276,7 @@ sub_8086C00: @ 8086C00
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -7299,15 +7299,15 @@ sub_8086C24: @ 8086C24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086C6C @ =gMapObjects
+ ldr r1, _08086C6C @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086C4E
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086C60
@@ -7315,7 +7315,7 @@ _08086C4E:
bl sub_805CBE8
adds r0, r4, 0
movs r1, 0x45
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7325,7 +7325,7 @@ _08086C60:
bx r0
.align 2, 0
_08086C68: .4byte gPlayerAvatar
-_08086C6C: .4byte gMapObjects
+_08086C6C: .4byte gObjectEvents
thumb_func_end sub_8086C24
thumb_func_start sub_8086C70
@@ -7337,10 +7337,10 @@ sub_8086C70: @ 8086C70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086CA0 @ =gMapObjects
+ ldr r1, _08086CA0 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086CEE
@@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70
b _08086CAE
.align 2, 0
_08086C9C: .4byte gPlayerAvatar
-_08086CA0: .4byte gMapObjects
+_08086CA0: .4byte gObjectEvents
_08086CA4:
movs r0, 0x8
ands r0, r1
@@ -7366,7 +7366,7 @@ _08086CAE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
b _08086CD2
_08086CC0:
movs r0, 0
@@ -7375,7 +7375,7 @@ _08086CC0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -7385,7 +7385,7 @@ _08086CD2:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectForceSetSpecialAnim
+ bl ObjectEventForceSetSpecialAnim
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -7403,9 +7403,9 @@ sub_8086CF4: @ 8086CF4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086D30 @ =gMapObjects
+ ldr r1, _08086D30 @ =gObjectEvents
adds r0, r1
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086D26
@@ -7424,14 +7424,14 @@ _08086D26:
bx r0
.align 2, 0
_08086D2C: .4byte gPlayerAvatar
-_08086D30: .4byte gMapObjects
+_08086D30: .4byte gObjectEvents
_08086D34: .4byte sub_8086BD0
thumb_func_end sub_8086CF4
thumb_func_start sub_8086D38
sub_8086D38: @ 8086D38
push {r4,lr}
- ldr r0, _08086D84 @ =gUnknown_83A0010
+ ldr r0, _08086D84 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x68]
movs r1, 0x78
movs r2, 0
@@ -7466,7 +7466,7 @@ sub_8086D38: @ 8086D38
pop {r1}
bx r1
.align 2, 0
-_08086D84: .4byte gUnknown_83A0010
+_08086D84: .4byte gFieldEffectObjectTemplatePointers
_08086D88: .4byte gSprites
_08086D8C: .4byte sub_8086D94
_08086D90: .4byte gFieldEffectArguments
@@ -7596,15 +7596,15 @@ sub_8086E70: @ 8086E70
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086EC4 @ =gMapObjects
+ ldr r1, _08086EC4 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086E9A
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086EB8
@@ -7617,7 +7617,7 @@ _08086E9A:
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7627,7 +7627,7 @@ _08086EB8:
bx r0
.align 2, 0
_08086EC0: .4byte gPlayerAvatar
-_08086EC4: .4byte gMapObjects
+_08086EC4: .4byte gObjectEvents
thumb_func_end sub_8086E70
thumb_func_start sub_8086EC8
@@ -7639,9 +7639,9 @@ sub_8086EC8: @ 8086EC8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086F04 @ =gMapObjects
+ ldr r1, _08086F04 @ =gObjectEvents
adds r0, r1
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086EF8
@@ -7660,7 +7660,7 @@ _08086EF8:
bx r0
.align 2, 0
_08086F00: .4byte gPlayerAvatar
-_08086F04: .4byte gMapObjects
+_08086F04: .4byte gObjectEvents
_08086F08: .4byte gFieldEffectArguments
thumb_func_end sub_8086EC8
@@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086F60 @ =gMapObjects
+ ldr r1, _08086F60 @ =gObjectEvents
adds r5, r0, r1
ldrh r1, [r4, 0x26]
movs r0, 0x8
@@ -7705,7 +7705,7 @@ _08086F54:
bx r0
.align 2, 0
_08086F5C: .4byte gPlayerAvatar
-_08086F60: .4byte gMapObjects
+_08086F60: .4byte gObjectEvents
thumb_func_end sub_8086F0C
thumb_func_start sub_8086F64
@@ -7729,17 +7729,17 @@ sub_8086F64: @ 8086F64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086FA4 @ =gMapObjects
+ ldr r1, _08086FA4 @ =gObjectEvents
adds r0, r1
movs r1, 0x2
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
_08086F98:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08086FA0: .4byte gPlayerAvatar
-_08086FA4: .4byte gMapObjects
+_08086FA4: .4byte gObjectEvents
thumb_func_end sub_8086F64
thumb_func_start sub_8086FA8
@@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08086FF8 @ =gMapObjects
+ ldr r1, _08086FF8 @ =gObjectEvents
adds r2, r0, r1
ldrh r1, [r4, 0xC]
movs r3, 0xC
@@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8
bne _08086FEC
_08086FCE:
adds r0, r2, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086FEC
@@ -7782,7 +7782,7 @@ _08086FEC:
bx r0
.align 2, 0
_08086FF4: .4byte gPlayerAvatar
-_08086FF8: .4byte gMapObjects
+_08086FF8: .4byte gObjectEvents
thumb_func_end sub_8086FA8
thumb_func_start sub_8086FFC
@@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08087064 @ =gMapObjects
+ ldr r0, _08087064 @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_805C808
@@ -7809,7 +7809,7 @@ sub_8086FFC: @ 8086FFC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -7824,7 +7824,7 @@ sub_8086FFC: @ 8086FFC
strb r0, [r4, 0x1]
adds r0, r4, 0
movs r1, 0x54
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7836,7 +7836,7 @@ _0808705A:
bx r0
.align 2, 0
_08087060: .4byte gPlayerAvatar
-_08087064: .4byte gMapObjects
+_08087064: .4byte gObjectEvents
_08087068: .4byte gSprites
thumb_func_end sub_8086FFC
@@ -7856,10 +7856,10 @@ sub_808706C: @ 808706C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08087108 @ =gMapObjects
+ ldr r0, _08087108 @ =gObjectEvents
adds r4, r0
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl ObjectEventClearAnimIfSpecialAnimActive
ldrb r1, [r4, 0x1]
movs r0, 0x11
negs r0, r0
@@ -7915,7 +7915,7 @@ _080870FC:
bx r0
.align 2, 0
_08087104: .4byte gPlayerAvatar
-_08087108: .4byte gMapObjects
+_08087108: .4byte gObjectEvents
_0808710C: .4byte gSprites
_08087110: .4byte gSaveBlock2Ptr
_08087114: .4byte sub_8087828
@@ -7967,7 +7967,7 @@ _08087164: .4byte sub_8086E40
thumb_func_start sub_8087168
sub_8087168: @ 8087168
push {lr}
- ldr r0, _080871A0 @ =gUnknown_83A0010
+ ldr r0, _080871A0 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x68]
movs r1, 0xFF
movs r2, 0xB4
@@ -7994,7 +7994,7 @@ sub_8087168: @ 8087168
pop {r1}
bx r1
.align 2, 0
-_080871A0: .4byte gUnknown_83A0010
+_080871A0: .4byte gFieldEffectObjectTemplatePointers
_080871A4: .4byte gSprites
_080871A8: .4byte sub_8087220
thumb_func_end sub_8087168
@@ -8430,15 +8430,15 @@ sub_80874C8: @ 80874C8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080875B8 @ =gMapObjects
+ ldr r1, _080875B8 @ =gObjectEvents
adds r5, r0, r1
adds r0, r5, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080874F2
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080875AE
@@ -8468,11 +8468,11 @@ _0808751A:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
bl CameraObjectReset2
adds r0, r5, 0
movs r1, 0x3
- bl FieldObjectTurn
+ bl ObjectEventTurn
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -8532,7 +8532,7 @@ _080875AE:
bx r0
.align 2, 0
_080875B4: .4byte gPlayerAvatar
-_080875B8: .4byte gMapObjects
+_080875B8: .4byte gObjectEvents
_080875BC: .4byte gSprites
_080875C0: .4byte gSaveBlock2Ptr
_080875C4: .4byte sub_8087828
@@ -8566,7 +8566,7 @@ _080875F2:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08087640 @ =gMapObjects
+ ldr r1, _08087640 @ =gObjectEvents
adds r0, r1
ldrb r0, [r0, 0x4]
lsls r4, r0, 4
@@ -8598,7 +8598,7 @@ _08087630:
.align 2, 0
_08087638: .4byte gSprites
_0808763C: .4byte gPlayerAvatar
-_08087640: .4byte gMapObjects
+_08087640: .4byte gObjectEvents
thumb_func_end sub_80875C8
thumb_func_start sub_8087644
@@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698
lsls r5, r0, 3
adds r5, r0
lsls r5, 2
- ldr r0, _08087708 @ =gMapObjects
+ ldr r0, _08087708 @ =gObjectEvents
adds r5, r0
ldrb r0, [r5, 0x4]
lsls r4, r0, 4
@@ -8688,7 +8688,7 @@ sub_8087698: @ 8087698
bl sub_805CB70
adds r0, r5, 0
movs r1, 0x45
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -8698,7 +8698,7 @@ _080876FC:
bx r0
.align 2, 0
_08087704: .4byte gPlayerAvatar
-_08087708: .4byte gMapObjects
+_08087708: .4byte gObjectEvents
_0808770C: .4byte gSprites
thumb_func_end sub_8087698
@@ -8711,9 +8711,9 @@ sub_8087710: @ 8087710
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08087744 @ =gMapObjects
+ ldr r1, _08087744 @ =gObjectEvents
adds r0, r1
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08087738
@@ -8728,7 +8728,7 @@ _08087738:
bx r0
.align 2, 0
_08087740: .4byte gPlayerAvatar
-_08087744: .4byte gMapObjects
+_08087744: .4byte gObjectEvents
thumb_func_end sub_8087710
thumb_func_start sub_8087748
@@ -8776,7 +8776,7 @@ fishE: @ 8087780
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080877F4 @ =gMapObjects
+ ldr r1, _080877F4 @ =gObjectEvents
adds r4, r0, r1
movs r7, 0
ldrh r1, [r5, 0x26]
@@ -8795,10 +8795,10 @@ _080877B4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
movs r1, 0x1
- bl FieldObjectTurn
+ bl ObjectEventTurn
ldrh r0, [r5, 0x26]
strb r0, [r6]
movs r0, 0
@@ -8816,7 +8816,7 @@ _080877EA:
bx r0
.align 2, 0
_080877F0: .4byte gPlayerAvatar
-_080877F4: .4byte gMapObjects
+_080877F4: .4byte gObjectEvents
_080877F8: .4byte sub_8087498
thumb_func_end fishE
@@ -8982,7 +8982,7 @@ sub_8087924: @ 8087924
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080879BA
@@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _080879C8 @ =gMapObjects
+ ldr r0, _080879C8 @ =gObjectEvents
adds r4, r0
movs r0, 0x10
ldrsh r5, [r4, r0]
@@ -9055,7 +9055,7 @@ _080879BA:
bx r1
.align 2, 0
_080879C4: .4byte gFieldEffectArguments
-_080879C8: .4byte gMapObjects
+_080879C8: .4byte gObjectEvents
_080879CC: .4byte sub_80879D8
_080879D0: .4byte gTasks
_080879D4: .4byte gSprites
@@ -9148,7 +9148,7 @@ _08087A78:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08087AB0 @ =gMapObjects
+ ldr r0, _08087AB0 @ =gObjectEvents
adds r4, r0
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x20]
@@ -9169,7 +9169,7 @@ _08087AA8:
pop {r0}
bx r0
.align 2, 0
-_08087AB0: .4byte gMapObjects
+_08087AB0: .4byte gObjectEvents
thumb_func_end sub_80879D8
thumb_func_start sub_8087AB4
@@ -9181,7 +9181,7 @@ sub_8087AB4: @ 8087AB4
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8]
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08087B04
@@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C
asrs r0, 16
cmp r0, 0x78
ble _08087C9A
- ldr r2, _08087CA4 @ =gMapObjects
+ ldr r2, _08087CA4 @ =gObjectEvents
movs r1, 0x4
ldrsh r0, [r7, r1]
lsls r1, r0, 3
@@ -9427,7 +9427,7 @@ _08087C9A:
pop {r0}
bx r0
.align 2, 0
-_08087CA4: .4byte gMapObjects
+_08087CA4: .4byte gObjectEvents
_08087CA8: .4byte gSprites
_08087CAC: .4byte 0x0000ffff
_08087CB0: .4byte 0x00007fff
@@ -9454,7 +9454,7 @@ sub_8087CB4: @ 8087CB4
ldrb r0, [r4, 0xC]
ldrb r1, [r4, 0xE]
ldrb r2, [r4, 0x10]
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveObjectEventByLocalIdAndMap
movs r0, 0x44
bl FieldEffectActiveListRemove
adds r0, r5, 0
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 7003a10f2..3f2cf04d1 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -105,7 +105,7 @@ _080DAE3C: .4byte gDummySpriteAffineAnimTable
sub_80DAE40: @ 80DAE40
push {lr}
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldrh r0, [r0, 0xA]
subs r0, 0x2
lsls r0, 16
@@ -127,7 +127,7 @@ npc_pal_op: @ 80DAE54
movs r0, 0
strh r0, [r4, 0x32]
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldrb r1, [r0, 0xC]
movs r0, 0x80
ands r0, r1
@@ -176,7 +176,7 @@ npc_pal_op_B: @ 80DAEC4
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, _080DAEF0 @ =0x000011ff
@@ -222,7 +222,7 @@ npc_pal_op_A: @ 80DAF20
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, _080DAF4C @ =0x000011ff
@@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080DAF98 @ =gMapObjects
+ ldr r1, _080DAF98 @ =gObjectEvents
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -281,7 +281,7 @@ _080DAF88:
strb r0, [r2]
b _080DB0AE
.align 2, 0
-_080DAF98: .4byte gMapObjects
+_080DAF98: .4byte gObjectEvents
_080DAF9C: .4byte gSprites
_080DAFA0: .4byte 0x00020001
_080DAFA4:
@@ -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
-_080DB270: .4byte gUnknown_83A0010
+_080DB26C: .4byte gObjectEvents
+_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
-_080DB8A4: .4byte gUnknown_83A0010
+_080DB8A0: .4byte gObjectEvents
+_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
-_080DBC24: .4byte gUnknown_83A0010
+_080DBC20: .4byte gObjectEvents
+_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
-_080DBE40: .4byte gUnknown_83A0010
+_080DBE3C: .4byte gObjectEvents
+_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
-_080DBFEC: .4byte gUnknown_83A0010
+_080DBFE8: .4byte gObjectEvents
+_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
-_080DC864: .4byte gUnknown_83A0010
+_080DC860: .4byte gObjectEvents
+_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
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index b5ec3a622..b9f0c842d 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -10,7 +10,7 @@ GetAllGroundEffectFlags_OnSpawn: @ 8067B34
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FieldObjectUpdateMetatileBehaviors
+ bl ObjectEventUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
bl GetGroundEffectFlags_Reflection
@@ -42,7 +42,7 @@ GetAllGroundEffectFlags_OnBeginStep: @ 8067B7C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FieldObjectUpdateMetatileBehaviors
+ bl ObjectEventUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
bl GetGroundEffectFlags_Reflection
@@ -80,7 +80,7 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FieldObjectUpdateMetatileBehaviors
+ bl ObjectEventUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
bl GetGroundEffectFlags_ShallowFlowingWater
@@ -110,8 +110,8 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
bx r0
thumb_func_end GetAllGroundEffectFlags_OnFinishStep
- thumb_func_start FieldObjectUpdateMetatileBehaviors
-FieldObjectUpdateMetatileBehaviors: @ 8067C24
+ thumb_func_start ObjectEventUpdateMetatileBehaviors
+ObjectEventUpdateMetatileBehaviors: @ 8067C24
push {r4,lr}
adds r4, r0, 0
movs r1, 0x14
@@ -129,7 +129,7 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24
pop {r4}
pop {r0}
bx r0
- thumb_func_end FieldObjectUpdateMetatileBehaviors
+ thumb_func_end ObjectEventUpdateMetatileBehaviors
thumb_func_start GetGroundEffectFlags_Reflection
GetGroundEffectFlags_Reflection: @ 8067C4C
@@ -602,7 +602,7 @@ sub_8067F88: @ 8067F88
push {r5-r7}
adds r5, r0, 0
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
movs r4, 0
movs r0, 0x1
mov r10, r0
@@ -828,8 +828,8 @@ _0806814E:
bx r1
thumb_func_end GetLedgeJumpDirection
- thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
-FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
+ thumb_func_start ObjectEventSetSpriteOamTableForLongGrass
+ObjectEventSetSpriteOamTableForLongGrass: @ 8068154
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -873,7 +873,7 @@ _080681A8:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
+ thumb_func_end ObjectEventSetSpriteOamTableForLongGrass
thumb_func_start IsZCoordMismatchAt
IsZCoordMismatchAt: @ 80681B0
@@ -910,8 +910,8 @@ _080681E4:
bx r1
thumb_func_end IsZCoordMismatchAt
- thumb_func_start FieldObjectUpdateZCoordAndPriority
-FieldObjectUpdateZCoordAndPriority: @ 80681EC
+ thumb_func_start ObjectEventUpdateZCoordAndPriority
+ObjectEventUpdateZCoordAndPriority: @ 80681EC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -920,7 +920,7 @@ FieldObjectUpdateZCoordAndPriority: @ 80681EC
cmp r0, 0
blt _0806823A
adds r0, r4, 0
- bl FieldObjectUpdateZCoord
+ bl ObjectEventUpdateZCoord
ldr r1, _08068240 @ =gUnknown_83A708C
ldrb r2, [r4, 0xB]
lsls r2, 24
@@ -957,7 +957,7 @@ _0806823A:
.align 2, 0
_08068240: .4byte gUnknown_83A708C
_08068244: .4byte gUnknown_83A707C
- thumb_func_end FieldObjectUpdateZCoordAndPriority
+ thumb_func_end ObjectEventUpdateZCoordAndPriority
thumb_func_start InitObjectPriorityByZCoord
InitObjectPriorityByZCoord: @ 8068248
@@ -1012,8 +1012,8 @@ ZCoordToPriority: @ 8068294
_080682A0: .4byte gUnknown_83A707C
thumb_func_end ZCoordToPriority
- thumb_func_start FieldObjectUpdateZCoord
-FieldObjectUpdateZCoord: @ 80682A4
+ thumb_func_start ObjectEventUpdateZCoord
+ObjectEventUpdateZCoord: @ 80682A4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x10
@@ -1055,7 +1055,7 @@ _080682F2:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end FieldObjectUpdateZCoord
+ thumb_func_end ObjectEventUpdateZCoord
thumb_func_start SetObjectSubpriorityByZCoord
SetObjectSubpriorityByZCoord: @ 80682F8
@@ -1096,8 +1096,8 @@ _08068338: .4byte gSpriteCoordOffsetY
_0806833C: .4byte gUnknown_83A706C
thumb_func_end SetObjectSubpriorityByZCoord
- thumb_func_start FieldObjectUpdateSubpriority
-FieldObjectUpdateSubpriority: @ 8068340
+ thumb_func_start ObjectEventUpdateSubpriority
+ObjectEventUpdateSubpriority: @ 8068340
push {lr}
adds r2, r0, 0
ldrb r0, [r2, 0x3]
@@ -1111,7 +1111,7 @@ FieldObjectUpdateSubpriority: @ 8068340
_08068356:
pop {r0}
bx r0
- thumb_func_end FieldObjectUpdateSubpriority
+ thumb_func_end ObjectEventUpdateSubpriority
thumb_func_start AreZCoordsCompatible
AreZCoordsCompatible: @ 806835C
@@ -1330,7 +1330,7 @@ GroundEffect_SandTracks: @ 80684D4
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldr r1, _080684FC @ =gUnknown_83A709C
ldrb r0, [r0, 0xD]
lsls r0, 2
@@ -1353,7 +1353,7 @@ GroundEffect_DeepSandTracks: @ 8068500
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetObjectEventGraphicsInfo
ldr r1, _08068528 @ =gUnknown_83A709C
ldrb r0, [r0, 0xD]
lsls r0, 2
@@ -1781,13 +1781,13 @@ DoGroundEffects_OnSpawn: @ 80687F0
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl FieldObjectUpdateZCoordAndPriority
+ bl ObjectEventUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
bl GetAllGroundEffectFlags_OnSpawn
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectSetSpriteOamTableForLongGrass
+ bl ObjectEventSetSpriteOamTableForLongGrass
ldr r2, [sp]
adds r0, r4, 0
adds r1, r5, 0
@@ -1820,13 +1820,13 @@ DoGroundEffects_OnBeginStep: @ 806883C
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl FieldObjectUpdateZCoordAndPriority
+ bl ObjectEventUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
bl GetAllGroundEffectFlags_OnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectSetSpriteOamTableForLongGrass
+ bl ObjectEventSetSpriteOamTableForLongGrass
adds r0, r4, 0
mov r1, sp
bl filters_out_some_ground_effects
@@ -1862,13 +1862,13 @@ DoGroundEffects_OnFinishStep: @ 8068890
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl FieldObjectUpdateZCoordAndPriority
+ bl ObjectEventUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
bl GetAllGroundEffectFlags_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
- bl FieldObjectSetSpriteOamTableForLongGrass
+ bl ObjectEventSetSpriteOamTableForLongGrass
adds r0, r4, 0
mov r1, sp
bl FilterOutStepOnPuddleGroundEffectIfJumping
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index f6b50bdc6..e4b28d6c6 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805B3D4 @ =gMapObjects
+ ldr r2, _0805B3D4 @ =gObjectEvents
adds r0, r2
ldr r2, _0805B3D8 @ =sub_805B3DC
- bl FieldObjectStep
+ bl ObjectEventStep
pop {r0}
bx r0
.align 2, 0
-_0805B3D4: .4byte gMapObjects
+_0805B3D4: .4byte gObjectEvents
_0805B3D8: .4byte sub_805B3DC
thumb_func_end sub_805B3B8
@@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805B458 @ =gMapObjects
+ ldr r1, _0805B458 @ =gObjectEvents
adds r5, r0, r1
adds r0, r5, 0
bl sub_805CC40
@@ -85,7 +85,7 @@ _0805B448:
bx r0
.align 2, 0
_0805B454: .4byte gPlayerAvatar
-_0805B458: .4byte gMapObjects
+_0805B458: .4byte gObjectEvents
thumb_func_end sub_805B3E0
thumb_func_start sub_805B45C
@@ -94,17 +94,17 @@ sub_805B45C: @ 805B45C
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0805B4A6
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _0805B4A6
adds r0, r4, 0
- bl FieldObjectGetSpecialAnim
+ bl ObjectEventGetSpecialAnim
lsls r0, 24
movs r1, 0xDF
lsls r1, 24
@@ -119,7 +119,7 @@ sub_805B45C: @ 805B45C
cmp r0, r5
beq _0805B4A2
adds r0, r4, 0
- bl FieldObjectClearAnim
+ bl ObjectEventClearAnim
b _0805B4A6
_0805B4A2:
movs r0, 0x1
@@ -222,7 +222,7 @@ sub_805B528: @ 805B528
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805B594 @ =gMapObjects
+ ldr r1, _0805B594 @ =gObjectEvents
adds r1, r0, r1
str r1, [r4]
ldrb r0, [r1]
@@ -245,7 +245,7 @@ sub_805B528: @ 805B528
strh r0, [r5, 0x1C]
_0805B57A:
ldr r0, [r4]
- bl FieldObjectClearAnim
+ bl ObjectEventClearAnim
ldrb r0, [r5, 0x1C]
bl sub_805C2CC
_0805B586:
@@ -254,7 +254,7 @@ _0805B586:
.align 2, 0
_0805B58C: .4byte gPlayerAvatar
_0805B590: .4byte gUnknown_2036E30
-_0805B594: .4byte gMapObjects
+_0805B594: .4byte gObjectEvents
_0805B598:
movs r0, 0
_0805B59A:
@@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0
ands r0, r1
cmp r0, 0
bne _0805B610
- ldr r2, _0805B5F8 @ =gMapObjects
+ ldr r2, _0805B5F8 @ =gObjectEvents
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -308,7 +308,7 @@ _0805B5CC:
b _0805B628
.align 2, 0
_0805B5F4: .4byte gPlayerAvatar
-_0805B5F8: .4byte gMapObjects
+_0805B5F8: .4byte gObjectEvents
_0805B5FC: .4byte gUnknown_835B764
_0805B600:
ldr r0, _0805B60C @ =gPlayerAvatar
@@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805B68C @ =gMapObjects
+ ldr r1, _0805B68C @ =gObjectEvents
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@@ -374,7 +374,7 @@ ForcedMovement_None: @ 805B644
ldrb r1, [r0, 0x18]
lsls r1, 28
lsrs r1, 28
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
ldrb r1, [r4]
movs r0, 0xBF
ands r0, r1
@@ -386,7 +386,7 @@ _0805B67E:
bx r1
.align 2, 0
_0805B688: .4byte gPlayerAvatar
-_0805B68C: .4byte gMapObjects
+_0805B68C: .4byte gObjectEvents
thumb_func_end ForcedMovement_None
thumb_func_start DoForcedMovement
@@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805B738 @ =gMapObjects
+ ldr r2, _0805B738 @ =gObjectEvents
adds r0, r2
ldrb r2, [r0, 0x1]
movs r3, 0x4
@@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
bx r1
.align 2, 0
_0805B734: .4byte gPlayerAvatar
-_0805B738: .4byte gMapObjects
+_0805B738: .4byte gObjectEvents
thumb_func_end DoForcedMovementInCurrentDirection
thumb_func_start ForcedMovement_Slip
@@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C
lsls r2, r3, 3
adds r2, r3
lsls r2, 2
- ldr r3, _0805B8C0 @ =gMapObjects
+ ldr r3, _0805B8C0 @ =gObjectEvents
adds r2, r3
ldrb r3, [r2, 0x1]
movs r4, 0x4
@@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C
bx r1
.align 2, 0
_0805B8BC: .4byte gPlayerAvatar
-_0805B8C0: .4byte gMapObjects
+_0805B8C0: .4byte gObjectEvents
thumb_func_end ForcedMovement_Slide
thumb_func_start ForcedMovement_SlideSouth
@@ -919,7 +919,7 @@ _0805BA30:
lsls r0, 24
cmp r0, 0
beq _0805BA8C
- ldr r2, _0805BA70 @ =gMapObjects
+ ldr r2, _0805BA70 @ =gObjectEvents
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -938,7 +938,7 @@ _0805BA30:
b _0805BA7A
.align 2, 0
_0805BA6C: .4byte 0x0000082f
-_0805BA70: .4byte gMapObjects
+_0805BA70: .4byte gObjectEvents
_0805BA74:
adds r0, r4, 0
bl sub_805C17C
@@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805BAE8 @ =gMapObjects
+ ldr r1, _0805BAE8 @ =gObjectEvents
adds r0, r1
ldrh r2, [r0, 0x10]
mov r1, sp
@@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC
b _0805BB00
.align 2, 0
_0805BAE4: .4byte gPlayerAvatar
-_0805BAE8: .4byte gMapObjects
+_0805BAE8: .4byte gObjectEvents
_0805BAEC:
movs r0, 0x1
mov r1, sp
@@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805BB98 @ =gMapObjects
+ ldr r1, _0805BB98 @ =gObjectEvents
adds r5, r0, r1
ldrh r1, [r5, 0x10]
add r0, sp, 0x4
@@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C
b _0805BB9E
.align 2, 0
_0805BB94: .4byte gPlayerAvatar
-_0805BB98: .4byte gMapObjects
+_0805BB98: .4byte gObjectEvents
_0805BB9C:
movs r0, 0x8
_0805BB9E:
@@ -1218,7 +1218,7 @@ sub_805BC60: @ 805BC60
lsrs r0, r5, 16
lsrs r1, r4, 16
movs r2, 0x3
- bl GetFieldObjectIdByXYZ
+ bl GetObjectEventIdByXYZ
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -1286,12 +1286,12 @@ sub_805BCEC: @ 805BCEC
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
- bl GetFieldObjectIdByXY
+ bl GetObjectEventIdByXY
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x10
beq _0805BDA0
- ldr r0, _0805BD9C @ =gMapObjects
+ ldr r0, _0805BD9C @ =gObjectEvents
lsls r1, r6, 3
adds r1, r6
lsls r1, 2
@@ -1347,7 +1347,7 @@ _0805BD8A:
b _0805BDA2
.align 2, 0
_0805BD98: .4byte 0x00000805
-_0805BD9C: .4byte gMapObjects
+_0805BD9C: .4byte gObjectEvents
_0805BDA0:
movs r0, 0
_0805BDA2:
@@ -1431,7 +1431,7 @@ _0805BE14:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805BE58 @ =gMapObjects
+ ldr r1, _0805BE58 @ =gObjectEvents
adds r0, r1
ldr r1, [r2]
bl _call_via_r1
@@ -1452,7 +1452,7 @@ _0805BE48:
.align 2, 0
_0805BE50: .4byte gPlayerAvatar
_0805BE54: .4byte gUnknown_835B844
-_0805BE58: .4byte gMapObjects
+_0805BE58: .4byte gObjectEvents
thumb_func_end DoPlayerAvatarTransition
thumb_func_start nullsub_22
@@ -1552,7 +1552,7 @@ _0805BEF6:
thumb_func_start player_is_anim_in_certain_ranges
player_is_anim_in_certain_ranges: @ 805BEFC
push {lr}
- ldr r2, _0805BF48 @ =gMapObjects
+ ldr r2, _0805BF48 @ =gObjectEvents
ldr r0, _0805BF4C @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1590,7 +1590,7 @@ _0805BF42:
movs r0, 0x1
b _0805BF52
.align 2, 0
-_0805BF48: .4byte gMapObjects
+_0805BF48: .4byte gObjectEvents
_0805BF4C: .4byte gPlayerAvatar
_0805BF50:
movs r0, 0
@@ -1629,16 +1629,16 @@ PlayerIsAnimActive: @ 805BF7C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805BF9C @ =gMapObjects
+ ldr r1, _0805BF9C @ =gObjectEvents
adds r0, r1
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805BF98: .4byte gPlayerAvatar
-_0805BF9C: .4byte gMapObjects
+_0805BF9C: .4byte gObjectEvents
thumb_func_end PlayerIsAnimActive
thumb_func_start PlayerCheckIfAnimFinishedOrInactive
@@ -1649,21 +1649,21 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805BFC0 @ =gMapObjects
+ ldr r1, _0805BFC0 @ =gObjectEvents
adds r0, r1
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805BFBC: .4byte gPlayerAvatar
-_0805BFC0: .4byte gMapObjects
+_0805BFC0: .4byte gObjectEvents
thumb_func_end PlayerCheckIfAnimFinishedOrInactive
thumb_func_start player_set_x22
player_set_x22: @ 805BFC4
- ldr r3, _0805BFD8 @ =gMapObjects
+ ldr r3, _0805BFD8 @ =gObjectEvents
ldr r1, _0805BFDC @ =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4
strb r0, [r1]
bx lr
.align 2, 0
-_0805BFD8: .4byte gMapObjects
+_0805BFD8: .4byte gObjectEvents
_0805BFDC: .4byte gPlayerAvatar
thumb_func_end player_set_x22
thumb_func_start player_get_x22
player_get_x22: @ 805BFE0
- ldr r2, _0805BFF4 @ =gMapObjects
+ ldr r2, _0805BFF4 @ =gObjectEvents
ldr r0, _0805BFF8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0
ldrb r0, [r0]
bx lr
.align 2, 0
-_0805BFF4: .4byte gMapObjects
+_0805BFF4: .4byte gObjectEvents
_0805BFF8: .4byte gPlayerAvatar
thumb_func_end player_get_x22
@@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, _0805C020 @ =gMapObjects
+ ldr r2, _0805C020 @ =gObjectEvents
adds r0, r2
- bl FieldObjectForceSetSpecialAnim
+ bl ObjectEventForceSetSpecialAnim
pop {r0}
bx r0
.align 2, 0
_0805C01C: .4byte gPlayerAvatar
-_0805C020: .4byte gMapObjects
+_0805C020: .4byte gObjectEvents
thumb_func_end sub_805BFFC
thumb_func_start sub_805C024
@@ -1734,10 +1734,10 @@ sub_805C024: @ 805C024
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805C068 @ =gMapObjects
+ ldr r1, _0805C068 @ =gObjectEvents
adds r0, r1
adds r1, r5, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C05E
@@ -1749,7 +1749,7 @@ _0805C05E:
bx r0
.align 2, 0
_0805C064: .4byte gPlayerAvatar
-_0805C068: .4byte gMapObjects
+_0805C068: .4byte gObjectEvents
thumb_func_end sub_805C024
thumb_func_start sub_805C06C
@@ -1762,10 +1762,10 @@ sub_805C06C: @ 805C06C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805C0A0 @ =gMapObjects
+ ldr r1, _0805C0A0 @ =gObjectEvents
adds r0, r1
adds r1, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C094
@@ -1778,7 +1778,7 @@ _0805C094:
bx r0
.align 2, 0
_0805C09C: .4byte gPlayerAvatar
-_0805C0A0: .4byte gMapObjects
+_0805C0A0: .4byte gObjectEvents
thumb_func_end sub_805C06C
thumb_func_start sub_805C0A4
@@ -1789,7 +1789,7 @@ sub_805C0A4: @ 805C0A4
lsls r1, 24
lsrs r5, r1, 24
adds r1, r5, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0805C0CA
@@ -2056,7 +2056,7 @@ _0805C27E:
lsls r0, 24
cmp r0, 0
beq _0805C2A6
- ldr r2, _0805C2B0 @ =gMapObjects
+ ldr r2, _0805C2B0 @ =gObjectEvents
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2075,7 +2075,7 @@ _0805C2A6:
bx r0
.align 2, 0
_0805C2AC: .4byte gPlayerAvatar
-_0805C2B0: .4byte gMapObjects
+_0805C2B0: .4byte gObjectEvents
thumb_func_end sub_805C270
thumb_func_start sub_805C2B4
@@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- ldr r2, _0805C4E8 @ =gMapObjects
+ ldr r2, _0805C4E8 @ =gObjectEvents
ldr r0, _0805C4EC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2378,7 +2378,7 @@ _0805C4DE:
pop {r0}
bx r0
.align 2, 0
-_0805C4E8: .4byte gMapObjects
+_0805C4E8: .4byte gObjectEvents
_0805C4EC: .4byte gPlayerAvatar
_0805C4F0: .4byte gUnknown_835B864
thumb_func_end sub_805C438
@@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- ldr r3, _0805C530 @ =gMapObjects
+ ldr r3, _0805C530 @ =gObjectEvents
ldr r2, _0805C534 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
pop {r0}
bx r0
.align 2, 0
-_0805C530: .4byte gMapObjects
+_0805C530: .4byte gObjectEvents
_0805C534: .4byte gPlayerAvatar
thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
thumb_func_start PlayerGetDestCoords
PlayerGetDestCoords: @ 805C538
push {r4,r5,lr}
- ldr r5, _0805C560 @ =gMapObjects
+ ldr r5, _0805C560 @ =gObjectEvents
ldr r4, _0805C564 @ =gPlayerAvatar
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
@@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538
pop {r0}
bx r0
.align 2, 0
-_0805C560: .4byte gMapObjects
+_0805C560: .4byte gObjectEvents
_0805C564: .4byte gPlayerAvatar
thumb_func_end PlayerGetDestCoords
@@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805C5C0 @ =gMapObjects
+ ldr r1, _0805C5C0 @ =gObjectEvents
adds r3, r0, r1
ldrb r1, [r3]
movs r0, 0xC0
@@ -2493,7 +2493,7 @@ _0805C5B0:
mov pc, r0
.align 2, 0
_0805C5BC: .4byte gPlayerAvatar
-_0805C5C0: .4byte gMapObjects
+_0805C5C0: .4byte gObjectEvents
_0805C5C4: .4byte gSprites
_0805C5C8: .4byte _0805C5CC
.align 2, 0
@@ -2584,7 +2584,7 @@ _0805C6BC:
thumb_func_start GetPlayerFacingDirection
GetPlayerFacingDirection: @ 805C6C4
- ldr r2, _0805C6DC @ =gMapObjects
+ ldr r2, _0805C6DC @ =gObjectEvents
ldr r0, _0805C6E0 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2596,13 +2596,13 @@ GetPlayerFacingDirection: @ 805C6C4
lsrs r0, 28
bx lr
.align 2, 0
-_0805C6DC: .4byte gMapObjects
+_0805C6DC: .4byte gObjectEvents
_0805C6E0: .4byte gPlayerAvatar
thumb_func_end GetPlayerFacingDirection
thumb_func_start player_get_direction_upper_nybble
player_get_direction_upper_nybble: @ 805C6E4
- ldr r2, _0805C6F8 @ =gMapObjects
+ ldr r2, _0805C6F8 @ =gObjectEvents
ldr r0, _0805C6FC @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4
lsrs r0, 4
bx lr
.align 2, 0
-_0805C6F8: .4byte gMapObjects
+_0805C6F8: .4byte gObjectEvents
_0805C6FC: .4byte gPlayerAvatar
thumb_func_end player_get_direction_upper_nybble
thumb_func_start PlayerGetZCoord
PlayerGetZCoord: @ 805C700
- ldr r2, _0805C714 @ =gMapObjects
+ ldr r2, _0805C714 @ =gObjectEvents
ldr r0, _0805C718 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700
lsrs r0, 4
bx lr
.align 2, 0
-_0805C714: .4byte gMapObjects
+_0805C714: .4byte gObjectEvents
_0805C718: .4byte gPlayerAvatar
thumb_func_end PlayerGetZCoord
@@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805C748 @ =gMapObjects
+ ldr r1, _0805C748 @ =gObjectEvents
adds r0, r1
lsls r3, 16
asrs r3, 16
@@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C
bx r0
.align 2, 0
_0805C744: .4byte gPlayerAvatar
-_0805C748: .4byte gMapObjects
+_0805C748: .4byte gObjectEvents
thumb_func_end sub_805C71C
thumb_func_start TestPlayerAvatarFlags
@@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805C7C4 @ =gMapObjects
+ ldr r0, _0805C7C4 @ =gObjectEvents
adds r4, r0
adds r0, r4, 0
bl npc_clear_strange_bits
@@ -2712,7 +2712,7 @@ sub_805C780: @ 805C780
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl ObjectEventSetDirection
movs r0, 0x6
bl TestPlayerAvatarFlags
lsls r0, 24
@@ -2727,7 +2727,7 @@ _0805C7B8:
bx r0
.align 2, 0
_0805C7C0: .4byte gPlayerAvatar
-_0805C7C4: .4byte gMapObjects
+_0805C7C4: .4byte gObjectEvents
thumb_func_end sub_805C780
thumb_func_start sub_805C7C8
@@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805C928 @ =gMapObjects
+ ldr r0, _0805C928 @ =gObjectEvents
adds r4, r0
ldrh r1, [r4, 0x10]
mov r0, sp
@@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
b _0805C92E
.align 2, 0
_0805C924: .4byte gPlayerAvatar
-_0805C928: .4byte gMapObjects
+_0805C928: .4byte gObjectEvents
_0805C92C:
movs r0, 0
_0805C92E:
@@ -3145,14 +3145,14 @@ InitPlayerAvatar: @ 805CA3C
strh r3, [r0, 0xE]
str r3, [sp, 0x10]
strh r3, [r0, 0x14]
- bl SpawnSpecialFieldObject
+ bl SpawnSpecialObjectEvent
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
lsls r4, r5, 3
adds r4, r5
lsls r4, 2
- ldr r0, _0805CAFC @ =gMapObjects
+ ldr r0, _0805CAFC @ =gObjectEvents
adds r4, r0
ldrb r0, [r4, 0x2]
movs r1, 0x1
@@ -3162,7 +3162,7 @@ InitPlayerAvatar: @ 805CA3C
strb r0, [r4, 0x1B]
adds r0, r4, 0
mov r1, r9
- bl FieldObjectTurn
+ bl ObjectEventTurn
bl ClearPlayerAvatarInfo
ldr r0, _0805CB00 @ =gPlayerAvatar
strb r6, [r0, 0x2]
@@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C
pop {r0}
bx r0
.align 2, 0
-_0805CAFC: .4byte gMapObjects
+_0805CAFC: .4byte gObjectEvents
_0805CB00: .4byte gPlayerAvatar
thumb_func_end InitPlayerAvatar
@@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r6, _0805CB64 @ =gMapObjects
+ ldr r6, _0805CB64 @ =gObjectEvents
ldr r5, _0805CB68 @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
@@ -3236,7 +3236,7 @@ _0805CB5C:
pop {r0}
bx r0
.align 2, 0
-_0805CB64: .4byte gMapObjects
+_0805CB64: .4byte gObjectEvents
_0805CB68: .4byte gPlayerAvatar
_0805CB6C: .4byte gSprites
thumb_func_end sub_805CB04
@@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805CBB0 @ =gMapObjects
+ ldr r0, _0805CBB0 @ =gObjectEvents
adds r4, r0
movs r0, 0x3
bl sub_805C808
@@ -3257,7 +3257,7 @@ sub_805CB70: @ 805CB70
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70
bx r0
.align 2, 0
_0805CBAC: .4byte gPlayerAvatar
-_0805CBB0: .4byte gMapObjects
+_0805CBB0: .4byte gObjectEvents
_0805CBB4: .4byte gSprites
thumb_func_end sub_805CB70
@@ -3311,14 +3311,14 @@ sub_805CBE8: @ 805CBE8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805CC24 @ =gMapObjects
+ ldr r0, _0805CC24 @ =gObjectEvents
adds r4, r0
bl sub_805CBB8
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8
bx r0
.align 2, 0
_0805CC20: .4byte gPlayerAvatar
-_0805CC24: .4byte gMapObjects
+_0805CC24: .4byte gObjectEvents
_0805CC28: .4byte gSprites
thumb_func_end sub_805CBE8
@@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C
lsrs r0, 24
ldr r6, _0805CD54 @ =gUnknown_835B8A0
ldr r2, _0805CD58 @ =gTasks
- ldr r5, _0805CD5C @ =gMapObjects
+ ldr r5, _0805CD5C @ =gObjectEvents
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3502,7 +3502,7 @@ _0805CD20:
.align 2, 0
_0805CD54: .4byte gUnknown_835B8A0
_0805CD58: .4byte gTasks
-_0805CD5C: .4byte gMapObjects
+_0805CD5C: .4byte gObjectEvents
_0805CD60: .4byte gPlayerAvatar
thumb_func_end taskFF_bump_boulder
@@ -3532,19 +3532,19 @@ sub_805CD84: @ 805CD84
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r6, 0xC]
bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
@@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r4, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
adds r0, r4, 0
bl sub_806DE28
ldrh r0, [r4, 0x10]
@@ -3677,7 +3677,7 @@ _0805CEB2:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _0805CEE8 @ =gMapObjects
+ ldr r0, _0805CEE8 @ =gObjectEvents
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3692,7 +3692,7 @@ _0805CEB2:
_0805CEDC: .4byte gUnknown_835B8AC
_0805CEE0: .4byte gTasks
_0805CEE4: .4byte gPlayerAvatar
-_0805CEE8: .4byte gMapObjects
+_0805CEE8: .4byte gObjectEvents
thumb_func_end sub_805CEA0
thumb_func_start PlayerAvatar_DoSecretBaseMatJump
@@ -3704,7 +3704,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805CF48
@@ -3785,7 +3785,7 @@ _0805CF8A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _0805CFC0 @ =gMapObjects
+ ldr r0, _0805CFC0 @ =gObjectEvents
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _0805CF8A:
_0805CFB4: .4byte gUnknown_835B8B0
_0805CFB8: .4byte gTasks
_0805CFBC: .4byte gPlayerAvatar
-_0805CFC0: .4byte gMapObjects
+_0805CFC0: .4byte gObjectEvents
thumb_func_end sub_805CF78
thumb_func_start sub_805CFC4
@@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC
movs r2, 0x4
bl memcpy
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D054
@@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064
movs r2, 0x5
bl memcpy
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D094
@@ -3924,7 +3924,7 @@ sub_805D0A4: @ 805D0A4
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D0E8
@@ -3964,7 +3964,7 @@ sub_805D0F8: @ 805D0F8
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl sav1_reset_battle_music_maybe
bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gPlayerAvatar
@@ -4005,7 +4005,7 @@ sub_805D154: @ 805D154
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r2, _0805D19C @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
@@ -4070,15 +4070,15 @@ taskFF_0805D1D4: @ 805D1D4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805D234 @ =gMapObjects
+ ldr r1, _0805D234 @ =gObjectEvents
adds r5, r0, r1
adds r0, r5, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0805D200
adds r0, r5, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D228
@@ -4106,7 +4106,7 @@ _0805D228:
bx r0
.align 2, 0
_0805D230: .4byte gPlayerAvatar
-_0805D234: .4byte gMapObjects
+_0805D234: .4byte gObjectEvents
_0805D238: .4byte gTasks
_0805D23C: .4byte sub_805D240
thumb_func_end taskFF_0805D1D4
@@ -4121,10 +4121,10 @@ sub_805D240: @ 805D240
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805D2B8 @ =gMapObjects
+ ldr r1, _0805D2B8 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805D2AE
@@ -4134,7 +4134,7 @@ sub_805D240: @ 805D240
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -4147,7 +4147,7 @@ sub_805D240: @ 805D240
movs r0, 0
strb r0, [r6, 0x6]
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
ldrb r1, [r4, 0x1A]
lsls r0, r1, 4
adds r0, r1
@@ -4164,7 +4164,7 @@ _0805D2AE:
bx r0
.align 2, 0
_0805D2B4: .4byte gPlayerAvatar
-_0805D2B8: .4byte gMapObjects
+_0805D2B8: .4byte gObjectEvents
_0805D2BC: .4byte gSprites
thumb_func_end sub_805D240
@@ -4281,7 +4281,7 @@ fish1: @ 805D35C
ldrh r1, [r6]
adds r1, r0
strh r1, [r5, 0x22]
- ldr r3, _0805D3EC @ =gMapObjects
+ ldr r3, _0805D3EC @ =gObjectEvents
ldr r2, _0805D3F0 @ =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -4296,7 +4296,7 @@ fish1: @ 805D35C
lsls r4, 2
adds r4, r3
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl ObjectEventClearAnimIfSpecialAnimActive
ldrb r0, [r4, 0x1]
movs r1, 0x8
orrs r0, r1
@@ -4316,7 +4316,7 @@ fish1: @ 805D35C
.align 2, 0
_0805D3E4: .4byte gUnknown_835B90C
_0805D3E8: .4byte gUnknown_835B912
-_0805D3EC: .4byte gMapObjects
+_0805D3EC: .4byte gObjectEvents
_0805D3F0: .4byte gPlayerAvatar
thumb_func_end fish1
@@ -4727,18 +4727,18 @@ _0805D6EA:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805D77C @ =gMapObjects
+ ldr r0, _0805D77C @ =gObjectEvents
mov r8, r0
add r4, r8
ldrh r1, [r5, 0x24]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
ldrb r1, [r7]
movs r0, 0x8
ands r0, r1
@@ -4777,7 +4777,7 @@ _0805D748:
.align 2, 0
_0805D774: .4byte gPlayerAvatar
_0805D778: .4byte gSprites
-_0805D77C: .4byte gMapObjects
+_0805D77C: .4byte gObjectEvents
_0805D780:
movs r1, 0xA
ldrsh r0, [r5, r1]
@@ -4971,18 +4971,18 @@ sub_805D8D8: @ 805D8D8
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0805D97C @ =gMapObjects
+ ldr r0, _0805D97C @ =gObjectEvents
mov r8, r0
add r4, r8
ldrh r1, [r6, 0x24]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl ObjectEventTurn
ldrb r1, [r5]
movs r0, 0x8
ands r0, r1
@@ -5024,7 +5024,7 @@ _0805D968:
.align 2, 0
_0805D974: .4byte gPlayerAvatar
_0805D978: .4byte gSprites
-_0805D97C: .4byte gMapObjects
+_0805D97C: .4byte gObjectEvents
thumb_func_end sub_805D8D8
thumb_func_start sub_805D980
@@ -5040,7 +5040,7 @@ sub_805D980: @ 805D980
ldr r0, _0805D9BC @ =gPlayerAvatar
strb r1, [r0, 0x6]
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
movs r0, 0
movs r1, 0x1
bl ClearDialogWindowAndFrame
@@ -5159,7 +5159,7 @@ _0805DA78:
ands r0, r1
cmp r0, 0
beq _0805DA9C
- ldr r2, _0805DAAC @ =gMapObjects
+ ldr r2, _0805DAAC @ =gObjectEvents
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5177,7 +5177,7 @@ _0805DA9C:
.align 2, 0
_0805DAA4: .4byte 0x0000fff8
_0805DAA8: .4byte gPlayerAvatar
-_0805DAAC: .4byte gMapObjects
+_0805DAAC: .4byte gObjectEvents
thumb_func_end sub_805D9C4
thumb_func_start sub_805DAB0
@@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805DB4C @ =gMapObjects
+ ldr r1, _0805DB4C @ =gObjectEvents
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04
b _0805DBFA
.align 2, 0
_0805DB48: .4byte gPlayerAvatar
-_0805DB4C: .4byte gMapObjects
+_0805DB4C: .4byte gObjectEvents
_0805DB50: .4byte gSprites
_0805DB54: .4byte gTasks+0x8
_0805DB58:
@@ -5280,7 +5280,7 @@ _0805DB58:
b _0805DBFA
_0805DB5E:
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0805DBFA
@@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805DC84 @ =gMapObjects
+ ldr r1, _0805DC84 @ =gObjectEvents
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38
b _0805DDBA
.align 2, 0
_0805DC80: .4byte gPlayerAvatar
-_0805DC84: .4byte gMapObjects
+_0805DC84: .4byte gObjectEvents
_0805DC88: .4byte gSprites
_0805DC8C: .4byte gTasks+0x8
_0805DC90:
@@ -5455,7 +5455,7 @@ _0805DC9A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectForceSetSpecialAnim
+ bl ObjectEventForceSetSpecialAnim
movs r0, 0
mov r9, r0
strh r6, [r5, 0x2]
@@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8
ble _0805DE20
_0805DDE4:
adds r0, r5, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _0805DE20
@@ -5623,7 +5623,7 @@ _0805DDE4:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectForceSetSpecialAnim
+ bl ObjectEventForceSetSpecialAnim
movs r0, 0
strh r0, [r6]
ldrb r0, [r5, 0x18]
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s
index 8d07f3779..f6e1c2f05 100644
--- a/asm/field_screen_effect.s
+++ b/asm/field_screen_effect.s
@@ -942,10 +942,10 @@ _0807F542:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0807F580 @ =gMapObjects
+ ldr r1, _0807F580 @ =gObjectEvents
adds r0, r1
movs r1, 0x2
- bl FieldObjectTurn
+ bl ObjectEventTurn
ldr r1, _0807F584 @ =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -958,7 +958,7 @@ _0807F542:
.align 2, 0
_0807F578: .4byte gUnknown_841B5B6
_0807F57C: .4byte gPlayerAvatar
-_0807F580: .4byte gMapObjects
+_0807F580: .4byte gObjectEvents
_0807F584: .4byte gTasks
_0807F588:
lsls r4, r6, 2
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 06ac697bc..704d8d5d8 100644
--- a/asm/item_menu.s
+++ b/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
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index d1f18a8ae..3b76df047 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -10857,7 +10857,7 @@ _0811B294: .4byte gUnknown_203B06C
sub_811B298: @ 811B298
push {lr}
bl ScriptContext2_Enable
- bl ScriptFreezeMapObjects
+ bl ScriptFreezeObjectEvents
pop {r0}
bx r0
thumb_func_end sub_811B298
@@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveObjectEventByLocalIdAndMap
pop {r0}
bx r0
.align 2, 0
@@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0811B6D0
@@ -11378,16 +11378,16 @@ sub_811B66C: @ 811B66C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0811B6C0 @ =gMapObjects
+ ldr r1, _0811B6C0 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _0811B6D0
ldrb r1, [r5]
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0811B6C4
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
.align 2, 0
_0811B6B8: .4byte gUnknown_8457120
_0811B6BC: .4byte gSaveBlock1Ptr
-_0811B6C0: .4byte gMapObjects
+_0811B6C0: .4byte gObjectEvents
_0811B6C4:
ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
ldr r1, _0811B6E0 @ =0x00000183
@@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0811B748
@@ -11437,10 +11437,10 @@ sub_811B6E8: @ 811B6E8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0811B72C @ =gMapObjects
+ ldr r1, _0811B72C @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _0811B730
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
.align 2, 0
_0811B724: .4byte gUnknown_8457120
_0811B728: .4byte gSaveBlock1Ptr
-_0811B72C: .4byte gMapObjects
+_0811B72C: .4byte gObjectEvents
_0811B730:
bl ScriptContext2_IsEnabled
lsls r0, 24
@@ -11460,7 +11460,7 @@ _0811B730:
b _0811B748
_0811B742:
adds r0, r4, 0
- bl FreezeMapObject
+ bl FreezeObjectEvent
_0811B748:
movs r0, 0x1
_0811B74A:
diff --git a/asm/macros.inc b/asm/macros.inc
index 4eae2cccc..3cc26c6f7 100644
--- a/asm/macros.inc
+++ b/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
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 49ab9164f..527c715d7 100644
--- a/asm/naming_screen.s
+++ b/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
diff --git a/asm/overworld.s b/asm/overworld.s
index 370aa054d..21fce8cac 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -3841,7 +3841,7 @@ CB2_ContinueSavedGame: @ 8056938
bl sub_8056420
bl set_current_map_header_from_sav1
bl sub_80550A8
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
bl sub_8054E40
bl sub_80589E8
bl PlayTimeCounter_Start
@@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100
thumb_func_start sub_8057114
sub_8057114: @ 8057114
push {lr}
- ldr r2, _08057138 @ =gMapObjects
+ ldr r2, _08057138 @ =gObjectEvents
ldr r3, _0805713C @ =gPlayerAvatar
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
@@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114
pop {r0}
bx r0
.align 2, 0
-_08057138: .4byte gMapObjects
+_08057138: .4byte gObjectEvents
_0805713C: .4byte gPlayerAvatar
thumb_func_end sub_8057114
@@ -4852,7 +4852,7 @@ _080571D8:
adds r4, r7
ldrb r3, [r4, 0x13]
adds r0, r5, 0
- bl SpawnLinkPlayerMapObject
+ bl SpawnLinkPlayerObjectEvent
ldrb r1, [r4]
adds r0, r5, 0
bl sub_8058878
@@ -5126,7 +5126,7 @@ sub_8057430: @ 8057430
bl sub_8056420
bl set_current_map_header_from_sav1
bl sub_80550A8
- bl UnfreezeMapObjects
+ bl UnfreezeObjectEvents
bl sub_8054E40
bl sub_80589E8
bl PlayTimeCounter_Start
@@ -7136,12 +7136,12 @@ _08058368: .4byte gUnknown_3005450
_0805836C: .4byte 0x000008d2
thumb_func_end sub_805833C
- thumb_func_start ZeroLinkPlayerMapObject
-ZeroLinkPlayerMapObject: @ 8058370
+ thumb_func_start ZeroLinkPlayerObjectEvent
+ZeroLinkPlayerObjectEvent: @ 8058370
movs r1, 0
str r1, [r0]
bx lr
- thumb_func_end ZeroLinkPlayerMapObject
+ thumb_func_end ZeroLinkPlayerObjectEvent
thumb_func_start strange_npc_table_clear
strange_npc_table_clear: @ 8058378
@@ -7156,18 +7156,18 @@ strange_npc_table_clear: @ 8058378
_08058388: .4byte gUnknown_2031DEC
thumb_func_end strange_npc_table_clear
- thumb_func_start ZeroMapObject
-ZeroMapObject: @ 805838C
+ thumb_func_start ZeroObjectEvent
+ZeroObjectEvent: @ 805838C
push {lr}
movs r1, 0
movs r2, 0x24
bl memset
pop {r0}
bx r0
- thumb_func_end ZeroMapObject
+ thumb_func_end ZeroObjectEvent
- thumb_func_start SpawnLinkPlayerMapObject
-SpawnLinkPlayerMapObject: @ 805839C
+ thumb_func_start SpawnLinkPlayerObjectEvent
+SpawnLinkPlayerObjectEvent: @ 805839C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7200,12 +7200,12 @@ SpawnLinkPlayerMapObject: @ 805839C
lsls r5, r6, 3
adds r5, r6
lsls r5, 2
- ldr r0, _08058444 @ =gMapObjects
+ ldr r0, _08058444 @ =gObjectEvents
adds r5, r0
adds r0, r4, 0
- bl ZeroLinkPlayerMapObject
+ bl ZeroLinkPlayerObjectEvent
adds r0, r5, 0
- bl ZeroMapObject
+ bl ZeroObjectEvent
movs r2, 0
movs r1, 0x1
movs r0, 0x1
@@ -7238,7 +7238,7 @@ SpawnLinkPlayerMapObject: @ 805839C
adds r0, r5, 0
mov r1, r9
mov r2, r10
- bl InitLinkPlayerMapObjectPos
+ bl InitLinkPlayerObjectEventPos
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -7248,11 +7248,11 @@ SpawnLinkPlayerMapObject: @ 805839C
bx r0
.align 2, 0
_08058440: .4byte gUnknown_2031DEC
-_08058444: .4byte gMapObjects
- thumb_func_end SpawnLinkPlayerMapObject
+_08058444: .4byte gObjectEvents
+ thumb_func_end SpawnLinkPlayerObjectEvent
- thumb_func_start InitLinkPlayerMapObjectPos
-InitLinkPlayerMapObjectPos: @ 8058448
+ thumb_func_start InitLinkPlayerObjectEventPos
+InitLinkPlayerObjectEventPos: @ 8058448
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -7278,11 +7278,11 @@ InitLinkPlayerMapObjectPos: @ 8058448
adds r0, 0x8
strh r0, [r4, 0xC]
adds r0, r4, 0
- bl FieldObjectUpdateZCoord
+ bl ObjectEventUpdateZCoord
pop {r4}
pop {r0}
bx r0
- thumb_func_end InitLinkPlayerMapObjectPos
+ thumb_func_end InitLinkPlayerObjectEventPos
thumb_func_start sub_8058488
sub_8058488: @ 8058488
@@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, _080584B4 @ =gMapObjects
+ ldr r0, _080584B4 @ =gObjectEvents
adds r1, r0
strb r2, [r1, 0x19]
_080584AA:
@@ -7308,7 +7308,7 @@ _080584AA:
bx r0
.align 2, 0
_080584B0: .4byte gUnknown_2031DEC
-_080584B4: .4byte gMapObjects
+_080584B4: .4byte gObjectEvents
thumb_func_end sub_8058488
thumb_func_start sub_80584B8
@@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080584FC @ =gMapObjects
+ ldr r1, _080584FC @ =gObjectEvents
adds r4, r0, r1
ldrb r0, [r4, 0x4]
cmp r0, 0x40
@@ -7346,7 +7346,7 @@ _080584E4:
bx r0
.align 2, 0
_080584F8: .4byte gUnknown_2031DEC
-_080584FC: .4byte gMapObjects
+_080584FC: .4byte gObjectEvents
_08058500: .4byte gSprites
thumb_func_end sub_80584B8
@@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08058520 @ =gMapObjects
+ ldr r1, _08058520 @ =gObjectEvents
adds r0, r1
ldrb r0, [r0, 0x4]
bx lr
.align 2, 0
_0805851C: .4byte gUnknown_2031DEC
-_08058520: .4byte gMapObjects
+_08058520: .4byte gObjectEvents
thumb_func_end sub_8058504
thumb_func_start sub_8058524
@@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524
lsls r0, r3, 3
adds r0, r3
lsls r0, 2
- ldr r3, _08058548 @ =gMapObjects
+ ldr r3, _08058548 @ =gObjectEvents
adds r0, r3
ldrh r3, [r0, 0x10]
strh r3, [r1]
@@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524
bx lr
.align 2, 0
_08058544: .4byte gUnknown_2031DEC
-_08058548: .4byte gMapObjects
+_08058548: .4byte gObjectEvents
thumb_func_end sub_8058524
thumb_func_start sub_805854C
@@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08058568 @ =gMapObjects
+ ldr r1, _08058568 @ =gObjectEvents
adds r0, r1
ldrb r0, [r0, 0x19]
bx lr
.align 2, 0
_08058564: .4byte gUnknown_2031DEC
-_08058568: .4byte gMapObjects
+_08058568: .4byte gObjectEvents
thumb_func_end sub_805854C
thumb_func_start sub_805856C
@@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805858C @ =gMapObjects
+ ldr r1, _0805858C @ =gObjectEvents
adds r0, r1
ldrb r0, [r0, 0xB]
lsls r0, 28
@@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C
bx lr
.align 2, 0
_08058588: .4byte gUnknown_2031DEC
-_0805858C: .4byte gMapObjects
+_0805858C: .4byte gObjectEvents
thumb_func_end sub_805856C
thumb_func_start sub_8058590
@@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080585B4 @ =gMapObjects
+ ldr r1, _080585B4 @ =gObjectEvents
adds r0, r1
adds r0, 0x21
movs r1, 0
@@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590
bx lr
.align 2, 0
_080585B0: .4byte gUnknown_2031DEC
-_080585B4: .4byte gMapObjects
+_080585B4: .4byte gObjectEvents
thumb_func_end sub_8058590
thumb_func_start GetLinkPlayerIdAt
@@ -7479,7 +7479,7 @@ _080585DA:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _08058600 @ =gMapObjects
+ ldr r1, _08058600 @ =gObjectEvents
adds r1, r0, r1
movs r6, 0x10
ldrsh r0, [r1, r6]
@@ -7493,7 +7493,7 @@ _080585DA:
b _08058610
.align 2, 0
_080585FC: .4byte gUnknown_2031DEC
-_08058600: .4byte gMapObjects
+_08058600: .4byte gObjectEvents
_08058604:
adds r0, r2, 0x1
lsls r0, 24
@@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _0805864C @ =gMapObjects
+ ldr r1, _0805864C @ =gObjectEvents
adds r6, r0, r1
ldrb r0, [r5]
cmp r0, 0
@@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618
b _08058674
.align 2, 0
_08058648: .4byte gUnknown_2031DEC
-_0805864C: .4byte gMapObjects
+_0805864C: .4byte gObjectEvents
_08058650:
ldr r4, _0805867C @ =gUnknown_826D374
ldr r1, _08058680 @ =gUnknown_826D33C
@@ -7629,7 +7629,7 @@ sub_80586CC: @ 80586CC
adds r0, r5, 0
mov r2, sp
adds r3, r6, 0
- bl FieldObjectMoveDestCoords
+ bl ObjectEventMoveDestCoords
ldrb r0, [r4, 0x2]
ldrb r1, [r5, 0x19]
mov r2, sp
@@ -7653,7 +7653,7 @@ sub_80586CC: @ 80586CC
adds r0, r5, 0
bl npc_coords_shift
adds r0, r5, 0
- bl FieldObjectUpdateZCoord
+ bl ObjectEventUpdateZCoord
movs r0, 0x1
b _0805872C
_0805872A:
@@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC
mov r12, r2
lsls r3, 16
movs r4, 0
- ldr r0, _08058850 @ =gMapObjects
+ ldr r0, _08058850 @ =gObjectEvents
mov r9, r0
lsrs r2, r3, 16
mov r10, r2
@@ -7820,7 +7820,7 @@ _0805884A:
movs r0, 0x1
b _0805886A
.align 2, 0
-_08058850: .4byte gMapObjects
+_08058850: .4byte gObjectEvents
_08058854:
adds r0, r4, 0x1
lsls r0, 24
@@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080588B8 @ =gMapObjects
+ ldr r1, _080588B8 @ =gObjectEvents
adds r4, r0, r1
ldrb r0, [r2]
cmp r0, 0
@@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878
b _080588C6
.align 2, 0
_080588B4: .4byte gUnknown_2031DEC
-_080588B8: .4byte gMapObjects
+_080588B8: .4byte gObjectEvents
_080588BC:
ldrb r0, [r4]
lsls r0, 30
@@ -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
diff --git a/asm/script_movement.s b/asm/script_movement.s
index a2d48d44a..7a7adec6c 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -17,7 +17,7 @@ ScriptMovement_StartObjectMovementScript: @ 8097434
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08097456
@@ -61,7 +61,7 @@ ScriptMovement_IsObjectMovementFinished: @ 809748C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080974CE
@@ -480,7 +480,7 @@ _0809777C:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080977A8 @ =gMapObjects
+ ldr r1, _080977A8 @ =gObjectEvents
adds r0, r1
bl npc_sync_anim_pause_bits
_08097792:
@@ -495,7 +495,7 @@ _08097792:
bx r0
.align 2, 0
_080977A4: .4byte gTasks+0x8
-_080977A8: .4byte gMapObjects
+_080977A8: .4byte gObjectEvents
thumb_func_end UnfreezeObjects
thumb_func_start Task_80A244C
@@ -557,15 +557,15 @@ sub_80977F0: @ 80977F0
lsls r0, r4, 3
adds r0, r4
lsls r0, 2
- ldr r1, _08097850 @ =gMapObjects
+ ldr r1, _08097850 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsSpecialAnimActive
+ bl ObjectEventIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08097838
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0809786A
@@ -577,13 +577,13 @@ _08097838:
adds r1, r5, 0
bl sub_80976A8
adds r0, r4, 0
- bl FreezeMapObject
+ bl FreezeObjectEvent
b _0809786A
.align 2, 0
-_08097850: .4byte gMapObjects
+_08097850: .4byte gObjectEvents
_08097854:
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _0809786A
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index a2210173a..c12bcaeeb 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -19,7 +19,7 @@ _08081B40:
b _08081B7A
_08081B44:
movs r4, 0
- ldr r5, _08081B80 @ =gMapObjects
+ ldr r5, _08081B80 @ =gObjectEvents
_08081B48:
lsls r0, r4, 3
adds r0, r4
@@ -53,7 +53,7 @@ _08081B7A:
pop {r1}
bx r1
.align 2, 0
-_08081B80: .4byte gMapObjects
+_08081B80: .4byte gObjectEvents
thumb_func_end CheckForTrainersWantingBattle
thumb_func_start sub_8081B84
@@ -62,7 +62,7 @@ sub_8081B84: @ 8081B84
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
- bl GetFieldObjectScriptPointerByFieldObjectId
+ bl GetObjectEventScriptPointerByObjectEventId
adds r6, r0, 0
bl GetTrainerFlagFromScriptPointer
cmp r0, 0
@@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84
lsls r4, r5, 3
adds r0, r4, r5
lsls r0, 2
- ldr r1, _08081BE0 @ =gMapObjects
+ ldr r1, _08081BE0 @ =gObjectEvents
adds r0, r1
bl sub_8081BEC
lsls r0, 24
@@ -90,7 +90,7 @@ _08081BC0:
bl ConfigureAndSetUpOneTrainerBattle
adds r0, r4, r5
lsls r0, 2
- ldr r1, _08081BE0 @ =gMapObjects
+ ldr r1, _08081BE0 @ =gObjectEvents
adds r0, r1
subs r1, r7, 0x1
lsls r1, 24
@@ -99,7 +99,7 @@ _08081BC0:
movs r0, 0x1
b _08081BE6
.align 2, 0
-_08081BE0: .4byte gMapObjects
+_08081BE0: .4byte gObjectEvents
_08081BE4:
movs r0, 0
_08081BE6:
@@ -590,7 +590,7 @@ _08081F54:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0
bl FieldEffectStart
ldrb r0, [r4, 0x18]
@@ -601,7 +601,7 @@ _08081F54:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
_08081F82:
@@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08081FEE
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08082022
@@ -680,7 +680,7 @@ _08081FEE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0xE]
subs r0, 0x1
strh r0, [r5, 0xE]
@@ -688,7 +688,7 @@ _08081FEE:
_08082014:
adds r0, r4, 0
movs r1, 0x4A
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -705,12 +705,12 @@ sub_808202C: @ 808202C
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808204A
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080820AC
@@ -740,15 +740,15 @@ _0808204A:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080820B8 @ =gMapObjects
+ ldr r1, _080820B8 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080820A2
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080820AC
@@ -764,7 +764,7 @@ _080820AC:
bx r1
.align 2, 0
_080820B4: .4byte gPlayerAvatar
-_080820B8: .4byte gMapObjects
+_080820B8: .4byte gObjectEvents
thumb_func_end sub_808202C
thumb_func_start sub_80820BC
@@ -777,15 +777,15 @@ sub_80820BC: @ 80820BC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, _080820FC @ =gMapObjects
+ ldr r1, _080820FC @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080820E8
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080820EE
@@ -799,7 +799,7 @@ _080820EE:
bx r1
.align 2, 0
_080820F8: .4byte gPlayerAvatar
-_080820FC: .4byte gMapObjects
+_080820FC: .4byte gObjectEvents
thumb_func_end sub_80820BC
thumb_func_start sub_8082100
@@ -808,19 +808,19 @@ sub_8082100: @ 8082100
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808211E
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808212C
_0808211E:
adds r0, r4, 0
movs r1, 0x67
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -836,7 +836,7 @@ sub_8082134: @ 8082134
push {r4,lr}
adds r4, r1, 0
adds r0, r2, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08082148
@@ -855,19 +855,19 @@ sub_8082150: @ 8082150
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _0808216E
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808217C
_0808216E:
adds r0, r4, 0
movs r1, 0x4A
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -884,7 +884,7 @@ sub_8082184: @ 8082184
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl FieldObjectCheckHeldMovementStatus
+ bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _080821CA
@@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC
orrs r1, r2
strb r1, [r0, 0x5]
adds r0, r4, 0
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -970,7 +970,7 @@ sub_80821DC: @ 80821DC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -1024,8 +1024,8 @@ sub_808226C: @ 808226C
movs r0, 0x12
movs r1, 0x7
movs r2, 0x7F
- bl SpawnSpecialFieldObjectParameterized
- ldr r2, _080822C8 @ =gMapObjects
+ bl SpawnSpecialObjectEventParameterized
+ ldr r2, _080822C8 @ =gObjectEvents
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C
bx r1
.align 2, 0
_080822C4: .4byte gSaveBlock1Ptr
-_080822C8: .4byte gMapObjects
+_080822C8: .4byte gObjectEvents
thumb_func_end sub_808226C
thumb_func_start sub_80822CC
@@ -1061,15 +1061,15 @@ sub_80822CC: @ 80822CC
ldrb r2, [r0, 0x4]
movs r0, 0x7F
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r4, _0808234C @ =gMapObjects
+ ldr r4, _0808234C @ =gObjectEvents
adds r0, r4
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08082312
@@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC
adds r0, r1
lsls r0, 2
adds r0, r4
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808236E
@@ -1096,7 +1096,7 @@ _08082312:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _0808234C @ =gMapObjects
+ ldr r0, _0808234C @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl sub_8063FB0
@@ -1104,21 +1104,21 @@ _08082312:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x12]
adds r0, 0x1
strh r0, [r5, 0x12]
b _0808236E
.align 2, 0
_08082348: .4byte gSaveBlock1Ptr
-_0808234C: .4byte gMapObjects
+_0808234C: .4byte gObjectEvents
_08082350:
ldr r1, _08082378 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
adds r0, r6, 0
- bl FieldObjectGetLocalIdAndMap
+ bl ObjectEventGetLocalIdAndMap
movs r0, 0
bl FieldEffectStart
movs r0, 0
@@ -1147,7 +1147,7 @@ sub_808237C: @ 808237C
ldrb r2, [r0, 0x4]
movs r0, 0x7F
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
movs r0, 0
bl FieldEffectActiveListContains
lsls r0, 24
@@ -1158,9 +1158,9 @@ sub_808237C: @ 808237C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r4, _08082408 @ =gMapObjects
+ ldr r4, _08082408 @ =gObjectEvents
adds r0, r4
- bl FieldObjectIsMovementOverridden
+ bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080823CC
@@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl FieldObjectClearHeldMovementIfFinished
+ bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _0808242E
@@ -1187,7 +1187,7 @@ _080823CC:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, _08082408 @ =gMapObjects
+ ldr r0, _08082408 @ =gObjectEvents
adds r4, r0
movs r0, 0x1
bl sub_8063FB0
@@ -1195,14 +1195,14 @@ _080823CC:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetHeldMovement
+ bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x12]
adds r0, 0x1
strh r0, [r5, 0x12]
b _0808242E
.align 2, 0
_08082404: .4byte gSaveBlock1Ptr
-_08082408: .4byte gMapObjects
+_08082408: .4byte gObjectEvents
_0808240C:
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -1213,7 +1213,7 @@ _0808240C:
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveObjectEventByLocalIdAndMap
movs r0, 0
strh r0, [r5, 0x12]
movs r0, 0x2
@@ -1249,7 +1249,7 @@ sub_808243C: @ 808243C
cmp r0, 0
bne _0808246E
ldr r0, [sp]
- bl FieldObjectClearAnim
+ bl ObjectEventClearAnim
ldrh r0, [r4, 0x16]
adds r0, 0x1
strh r0, [r4, 0x16]
@@ -1560,7 +1560,7 @@ objc_exclamation_mark_probably: @ 80826A8
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080826DA
@@ -1579,7 +1579,7 @@ _080826DA:
bl FieldEffectStop
b _08082736
_080826E8:
- ldr r2, _0808272C @ =gMapObjects
+ ldr r2, _0808272C @ =gObjectEvents
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1614,7 +1614,7 @@ _080826E8:
strh r0, [r4, 0x34]
b _08082736
.align 2, 0
-_0808272C: .4byte gMapObjects
+_0808272C: .4byte gObjectEvents
_08082730: .4byte gSprites
_08082734:
strh r2, [r4, 0x34]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 02:53:44 +0000