diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 20:21:53 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 21:57:29 -0500 |
| commit | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (patch) | |
| tree | 3a133ce12022949fc3ea8a7147c0d3c72a97e0b6 /src/event_object_movement.c | |
| parent | ea8b1011d30c3f70f1da79553d8ed887b12596f2 (diff) | |
| parent | a40f05490040350b8973728fdebe5a48360d4fac (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a3cd676b1..572db3352 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1861,27 +1861,29 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { u8 bard; - if (graphicsId >= SPRITE_VAR) + if (graphicsId >= OBJ_EVENT_GFX_VARS) { - graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR); + graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS); } if (graphicsId == OBJ_EVENT_GFX_BARD) { bard = GetCurrentMauvilleOldMan(); return gMauvilleOldManGraphicsInfoPointers[bard]; } - if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) + + if (graphicsId >= NUM_OBJ_EVENT_GFX) { graphicsId = OBJ_EVENT_GFX_NINJA_BOY; } + return gObjectEventGraphicsInfoPointers[graphicsId]; } static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (objectEvent->graphicsId >= SPRITE_VAR) + if (objectEvent->graphicsId >= OBJ_EVENT_GFX_VARS) { - objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - SPRITE_VAR); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - OBJ_EVENT_GFX_VARS); } } |