diff options
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 87e78ed92..c30f50584 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -123,8 +123,8 @@ EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; extern const u8 gRangedMovementTypes[NUM_FIELD_MAP_OBJECT_TEMPLATES]; -extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; extern void (*const sMovementTypeCallbacks[])(struct Sprite *); +extern const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES]; extern const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX]; extern const struct SpritePalette sObjectEventSpritePalettes[]; extern const struct PairedPalettes gPlayerReflectionPaletteSets[]; @@ -884,7 +884,7 @@ extern const u32 gUnknown_8394E28[]; #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -/*#include "data/object_events/object_event_graphics_info_pointers.h"*/ +#include "data/object_events/object_event_graphics_info_pointers.h" #include "data/field_effects/field_effect_object_template_pointers.h" #include "data/object_events/object_event_pic_tables.h" #include "data/object_events/object_event_anims.h" @@ -2719,8 +2719,8 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) if (graphicsId >= OBJ_EVENT_GFX_VARS) graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS); - if (graphicsId >= 152) - graphicsId = 16; + if (graphicsId >= NUM_OBJ_EVENT_GFX) + graphicsId = OBJ_EVENT_GFX_LITTLE_BOY; return gObjectEventGraphicsInfoPointers[graphicsId]; } |