diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 6 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 5eda0be21..5b7c3f784 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -88,11 +88,11 @@ void sub_805FE7C(struct ObjectEvent *, u8); void SetTrainerMovementType(struct ObjectEvent *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); -void ObjectEventSetGraphicsId(struct ObjectEvent *mapObject, u8 a1); +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 a1); u8 sub_805EB44(u8, u8, s16, s16); void npc_paltag_set_load(u8 mode); -bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject); -u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); u8 sub_8063F84(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); void CameraObjectSetFollowedObjectId(u8 spriteId); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 8d1097017..e567c6d5f 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -288,7 +288,7 @@ struct PlayerAvatar /* 0x202E858 */ /*0x02*/ u8 running2; /*0x03*/ u8 running1; /*0x04*/ u8 spriteId; - /*0x05*/ u8 mapObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ u8 unk6; /*0x07*/ u8 gender; u8 acroBikeState; |