summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/constants/event_bg.h (renamed from include/constants/bg_event_constants.h)6
-rwxr-xr-xinclude/constants/event_object_movement.h (renamed from include/constants/event_object_movement_constants.h)6
-rw-r--r--include/constants/event_objects.h6
-rw-r--r--include/event_obj_lock.h6
-rw-r--r--include/event_object_movement.h6
5 files changed, 15 insertions, 15 deletions
diff --git a/include/constants/bg_event_constants.h b/include/constants/event_bg.h
index a915bc509..64f3331b8 100755
--- a/include/constants/bg_event_constants.h
+++ b/include/constants/event_bg.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CONSTANTS_BG_EVENT_H
-#define GUARD_CONSTANTS_BG_EVENT_H
+#ifndef GUARD_CONSTANTS_EVENT_BG_H
+#define GUARD_CONSTANTS_EVENT_BG_H
#define BG_EVENT_PLAYER_FACING_ANY 0
#define BG_EVENT_PLAYER_FACING_NORTH 1
@@ -10,4 +10,4 @@
#define BG_EVENT_HIDDEN_ITEM 7
#define BG_EVENT_SECRET_BASE 8
-#endif // GUARD_CONSTANTS_BG_EVENT_H
+#endif // GUARD_CONSTANTS_EVENT_BG_H
diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement.h
index 81d2417a1..a93a2ac05 100755
--- a/include/constants/event_object_movement_constants.h
+++ b/include/constants/event_object_movement.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CONSTANTS_EVENTOBJMV_H
-#define GUARD_CONSTANTS_EVENTOBJMV_H
+#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
+#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
#define MOVEMENT_TYPE_NONE 0x0
#define MOVEMENT_TYPE_LOOK_AROUND 0x1
@@ -218,4 +218,4 @@
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89
-#endif // GUARD_CONSTANTS_EVENTOBJMV_H
+#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index eeb18e7cb..0bf530cf7 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H
-#define GUARD_CONSTANTS_OBJECT_EVENTS_H
+#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H
+#define GUARD_CONSTANTS_EVENT_OBJECTS_H
#define OBJ_EVENT_GFX_BRENDAN_NORMAL 0
#define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1
@@ -252,4 +252,4 @@
#define TRACKS_FOOT 1
#define TRACKS_BIKE_TIRE 2
-#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H
+#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
index 7a293cc01..b2868cf76 100644
--- a/include/event_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_OBJ_EVENT_LOCK_H
-#define GUARD_OBJ_EVENT_LOCK_H
+#ifndef GUARD_EVENT_OBJ_LOCK_H
+#define GUARD_EVENT_OBJ_LOCK_H
bool8 walkrun_is_standing_still(void);
void sub_8064CDC(u8 taskId);
@@ -13,4 +13,4 @@ void unref_sub_8064E5C(void);
void sub_8064EAC(void);
void sub_8064ED4(void);
-#endif // GUARD_OBJ_EVENT_LOCK_H
+#endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 949fb87d2..8a28be8ae 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_EVENTOBJMV_H
-#define GUARD_EVENTOBJMV_H
+#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H
+#define GUARD_EVENT_OBJECT_MOVEMENT_H
#include "sprite.h"
@@ -463,4 +463,4 @@ u8 ZCoordToPriority(u8);
void ObjectEventUpdateZCoord(struct ObjectEvent *pObject);
void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
-#endif // GUARD_EVENTOBJMV_H
+#endif // GUARD_EVENT_OBJECT_MOVEMENT_H