diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 70463728f3..c46099e39a 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -433,4 +433,3 @@ SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica:
 	.string "“S.S. ANNE\p"
 	.string "“A replica of the luxury liner that\n"
 	.string "circles the globe.”$"
-
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index a0ca0063dc..907a0e08fa 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -331,6 +331,7 @@
 #define LOCALID_NONE                         0
 #define LOCALID_CAMERA                     127
 #define LOCALID_BERRY_BLENDER_PLAYER_END   240 // This will use 5 (MAX_RFU_PLAYERS) IDs ending at 240, i.e. 236-240
+#define LOCALID_FOLLOWING_POKEMON          254
 #define LOCALID_PLAYER                     255
 #define OBJ_EVENT_ID_FOLLOWER 0xFE
 #define OBJ_EVENT_ID_NPC_FOLLOWER 0xFD
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 51cc2c991c..a9d1e61277 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -182,7 +182,7 @@ u8 GetWalkInPlaceFasterMovementAction(u32);
 u8 GetWalkInPlaceFastMovementAction(u32);
 u8 GetWalkInPlaceNormalMovementAction(u32);
 u8 GetWalkInPlaceSlowMovementAction(u32);
-u8 GetCollisionAtCoords(struct ObjectEvent *, s16 x, s16 y, u32 dir);
+u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir);
 u32 GetObjectObjectCollidesWith(struct ObjectEvent *objectEvent, s16 x, s16 y, bool32 addCoords);
 void MoveCoords(u8 direction, s16 *x, s16 *y);
 bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 0c97da4337..65dce3dfda 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -22,7 +22,7 @@ void StartRevealDisguise(struct ObjectEvent *objectEvent);
 void StartAshFieldEffect(s16 x, s16 y, u16 metatileId, s16 delay);
 void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection);
 void SetUpShadow(struct ObjectEvent *objectEvent);
-u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent *objectEvent);
+u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent);
 u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 void UpdateRayquazaSpotlightEffect(struct Sprite *sprite);
 void UpdateShadowFieldEffect(struct Sprite *sprite);