diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:32:22 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 6c5f3e3470e6c6f6a64e26f64240f41fe40833c2 (patch) | |
| tree | 01192051ba4444c432d207a99c34d547766d35b4 /src | |
| parent | 68fecc9f72bb15462cb4b7f007f0d699a75c29dd (diff) | |
Sync with pret/pokeemerald:959
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/object_event/event_object_graphics_info_pointers.h | 2 | ||||
| -rw-r--r-- | src/event_object_movement.c | 6 |
2 files changed, 4 insertions, 4 deletions
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); } |