diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-02-12 17:32:51 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-02-12 17:32:51 -0600 |
| commit | 49421a41b2b28c167f6fca8287361f23e6bd00a9 (patch) | |
| tree | 98c986208f169c3f2f7e8405a03d519163065dc4 /src/event_object_movement.c | |
| parent | 956090b05f678db9f43d567131d6d43ce11806ec (diff) | |
Move field effects data and graphics into own directory, and cleanup naming for object events
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 572db3352..464e6acec 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/object_event/event_object_graphics.h" +#include "data/object_events/object_event_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -#include "data/object_event/event_object_graphics_info_pointers.h" -#include "data/object_event/field_effect_object_template_pointers.h" -#include "data/object_event/event_object_pic_tables.h" -#include "data/object_event/event_object_anims.h" -#include "data/object_event/base_oam.h" -#include "data/object_event/event_object_subsprites.h" -#include "data/object_event/event_object_graphics_info.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" +#include "data/object_events/base_oam.h" +#include "data/object_events/object_event_subsprites.h" +#include "data/object_events/object_event_graphics_info.h" const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/object_event/berry_tree_graphics_tables.h" -#include "data/object_event/field_effect_objects.h" +#include "data/object_events/berry_tree_graphics_tables.h" +#include "data/field_effects/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/object_event/movement_type_func_tables.h" +#include "data/object_events/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/object_event/movement_action_func_tables.h" +#include "data/object_events/movement_action_func_tables.h" // Code |