3 files changed, 8 insertions, 13 deletions
diff --git a/src/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/movement_action_func_tables.h
index e1c295bb8..ea10e0b6d 100644
--- a/src/data/field_map_obj/anim_func_ptrs.h
+++ b/src/data/field_map_obj/movement_action_func_tables.h
@@ -1,5 +1,5 @@
-#ifndef POKERUBY_ANIM_FUNC_PTRS_H
-#define POKERUBY_ANIM_FUNC_PTRS_H
+#ifndef POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
+#define POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
 
 u8 MovementAction_FaceDown_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_PauseSpriteAnim(struct MapObject *, struct Sprite *);
@@ -1353,4 +1353,4 @@ u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct MapObject *, s
     MovementAction_PauseSpriteAnim
 };
 
-#endif //POKERUBY_ANIM_FUNC_PTRS_H
+#endif //POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
diff --git a/src/data/field_map_obj/callback_subroutine_pointers.h b/src/data/field_map_obj/movement_type_func_tables.h
index 04bbb2479..00b05c8f6 100644
--- a/src/data/field_map_obj/callback_subroutine_pointers.h
+++ b/src/data/field_map_obj/movement_type_func_tables.h
@@ -1,10 +1,5 @@
-//
-
-//
-
-#ifndef POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
-#define POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
-
+#ifndef POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
+#define POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
 
 u8 (*const gMovementTypeFuncs_WanderAround[])(struct MapObject *, struct Sprite *) = {
     MovementType_WanderAround_Step0,
@@ -440,4 +435,4 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct MapObject *, struct Sprite *)
     MovementType_Invisible_Step2
 };
 
-#endif //POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
+#endif //POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 93f6248e6..17329e792 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1956,7 +1956,7 @@ const s16 gMovementDelaysMedium[] = {32, 64,  96, 128};
 const s16 gMovementDelaysLong[] =   {32, 64, 128, 192};
 const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
 
-#include "data/field_map_obj/callback_subroutine_pointers.h"
+#include "data/field_map_obj/movement_type_func_tables.h"
 
 const u8 gFaceDirectionAnimNums[] = {
     0, // DIR_NONE
@@ -2377,7 +2377,7 @@ const u8 gUnknown_08375767[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "data/field_map_obj/anim_func_ptrs.h"
+#include "data/field_map_obj/movement_action_func_tables.h"
 
 // text