diff options
| -rw-r--r-- | include/constants/event_objects.h | 38 | ||||
| -rw-r--r-- | src/data/object_event/event_object_graphics_info_pointers.h | 2 | ||||
| -rw-r--r-- | src/event_object_movement.c | 6 |
3 files changed, 23 insertions, 23 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0bf530cf7..21cb3f7f4 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -220,28 +220,28 @@ #define OBJ_EVENT_GFX_LINK_BRENDAN 216 #define OBJ_EVENT_GFX_LINK_MAY 217 +#define NUM_OBJ_EVENT_GFX 218 + // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define OBJ_EVENT_GFX_VAR_0 240 -#define OBJ_EVENT_GFX_VAR_1 241 -#define OBJ_EVENT_GFX_VAR_2 242 -#define OBJ_EVENT_GFX_VAR_3 243 -#define OBJ_EVENT_GFX_VAR_4 244 -#define OBJ_EVENT_GFX_VAR_5 245 -#define OBJ_EVENT_GFX_VAR_6 246 -#define OBJ_EVENT_GFX_VAR_7 247 -#define OBJ_EVENT_GFX_VAR_8 248 -#define OBJ_EVENT_GFX_VAR_9 249 -#define OBJ_EVENT_GFX_VAR_A 250 -#define OBJ_EVENT_GFX_VAR_B 251 -#define OBJ_EVENT_GFX_VAR_C 252 -#define OBJ_EVENT_GFX_VAR_D 253 -#define OBJ_EVENT_GFX_VAR_E 254 -#define OBJ_EVENT_GFX_VAR_F 255 - -#define NUM_OBJECT_GRAPHICS_INFO 217 -#define SPRITE_VAR 239 +#define OBJ_EVENT_GFX_VARS 240 +#define OBJ_EVENT_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) +#define OBJ_EVENT_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1) +#define OBJ_EVENT_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2) +#define OBJ_EVENT_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3) +#define OBJ_EVENT_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4) +#define OBJ_EVENT_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5) +#define OBJ_EVENT_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6) +#define OBJ_EVENT_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7) +#define OBJ_EVENT_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8) +#define OBJ_EVENT_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9) +#define OBJ_EVENT_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA) +#define OBJ_EVENT_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB) +#define OBJ_EVENT_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC) +#define OBJ_EVENT_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD) +#define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE) +#define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255 #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h index ad3d6f227..1725b7168 100644 --- a/src/data/object_event/event_object_graphics_info_pointers.h +++ b/src/data/object_event/event_object_graphics_info_pointers.h @@ -220,7 +220,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay; -const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = { [OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, [OBJ_EVENT_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 7cffdcbc0..0dd297908 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1761,11 +1761,11 @@ static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Spri const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { - if (graphicsId > SPRITE_VAR) + if (graphicsId >= OBJ_EVENT_GFX_VARS) { graphicsId = VarGetObjectEventGraphicsId(graphicsId + 16); } - if (graphicsId > NUM_OBJECT_GRAPHICS_INFO) + if (graphicsId >= NUM_OBJ_EVENT_GFX) { graphicsId = OBJ_EVENT_GFX_LITTLE_BOY_1; } @@ -1774,7 +1774,7 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (objectEvent->graphicsId > SPRITE_VAR) + if (objectEvent->graphicsId >= OBJ_EVENT_GFX_VARS) { objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId + 16); } |