finish object event rename

include/event_object_movement.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_FIELD_MAP_OBJ_H
-#define GUARD_FIELD_MAP_OBJ_H
+#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H
+#define GUARD_EVENT_OBJECT_MOVEMENT_H
 
 #include "global.h"
 
@@ -96,6 +96,8 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject);
 u8 sub_8063F84(u8 direction);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
 void CameraObjectSetFollowedObjectId(u8 spriteId);
+void UnfreezeObjectEvents(void);
+void sub_8069058(u8, u8);
 
 // Exported data declarations
 
@@ -103,4 +105,4 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gUnknown_83A0010[];
 
-#endif //GUARD_FIELD_MAP_OBJ_H
+#endif // GUARD_EVENT_OBJECT_MOVEMENT_H

include/field_map_obj_helpers.h

@@ -1,9 +0,0 @@
-#ifndef GUARD_FIELDMAPOBJHELP_H
-#define GUARD_FIELDMAPOBJHELP_H
-
-#include "global.h"
-
-void UnfreezeObjectEvents(void);
-void sub_8069058(u8, u8);
-
-#endif

include/global.fieldmap.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_GLOBAL_FIELDMAP_H
 #define GUARD_GLOBAL_FIELDMAP_H
 
-#define NUM_FIELD_OBJECTS 16
+#define OBJECT_EVENTS_COUNT 16
 
 enum
 {
@@ -309,7 +309,7 @@ struct Camera
     s32 y;
 };
 
-extern struct ObjectEvent gObjectEvents[NUM_FIELD_OBJECTS];
+extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT];
 extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;