diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-08 14:36:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-08 14:36:03 -0400 |
| commit | c05af7f3941ab1aae6b45dfd0290b0d378a4aa72 (patch) | |
| tree | 9759375214d042e1aea2d0c8b09793f5314cd53d | |
| parent | f12ce45033534445bc86fc955a0923148286c74c (diff) | |
Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT
| -rw-r--r-- | include/constants/event_object_movement.h | 1 | ||||
| -rw-r--r-- | src/event_object_movement.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 008d3a117..62c5a2ef2 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -83,6 +83,7 @@ #define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E #define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F #define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 +#define MOVEMENT_TYPES_COUNT 0x51 #define MOVEMENT_ACTION_FACE_DOWN 0x0 #define MOVEMENT_ACTION_FACE_UP 0x1 diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d216852c1..a671ada34 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -18,8 +18,6 @@ #include "constants/event_object_movement.h" #include "constants/event_objects.h" -#define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 - static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static u8 GetCollisionInDirection(struct ObjectEvent *, u8); @@ -197,7 +195,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { #include "data/object_events/object_event_graphics.h" -static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { +static void (*const sMovementTypeCallbacks[MOVEMENT_TYPES_COUNT])(struct Sprite *) = { [MOVEMENT_TYPE_NONE] = MovementType_None, [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround, [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround, @@ -281,7 +279,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = MovementType_WanderAroundSlowest, }; -static const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const bool8 gRangedMovementTypes[MOVEMENT_TYPES_COUNT] = { [MOVEMENT_TYPE_NONE] = FALSE, [MOVEMENT_TYPE_LOOK_AROUND] = FALSE, [MOVEMENT_TYPE_WANDER_AROUND] = TRUE, @@ -365,7 +363,7 @@ static const bool8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { [MOVEMENT_TYPE_WANDER_AROUND_SLOWEST] = TRUE, }; -static const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = { +static const u8 gInitialMovementTypeFacingDirections[MOVEMENT_TYPES_COUNT] = { [MOVEMENT_TYPE_NONE] = DIR_SOUTH, [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, |