From 667c53e25b4db2c5fc3bcbdb50825843dfaded4e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 21 Nov 2019 14:14:14 -0500 Subject: Fix event object include guards and constant filenames --- data/map_events.s | 4 +- include/constants/bg_event_constants.h | 13 -- include/constants/event_bg.h | 13 ++ include/constants/event_object_movement.h | 221 +++++++++++++++++++++ .../constants/event_object_movement_constants.h | 221 --------------------- include/constants/event_objects.h | 6 +- include/event_obj_lock.h | 6 +- include/event_object_movement.h | 6 +- src/berry.c | 2 +- src/event_object_movement.c | 2 +- src/field_control_avatar.c | 2 +- src/field_effect.c | 2 +- src/field_fadetransition.c | 2 +- src/field_player_avatar.c | 2 +- src/field_specials.c | 2 +- src/item_use.c | 2 +- src/rom6.c | 2 +- src/secret_base.c | 2 +- src/trainer_see.c | 2 +- 19 files changed, 256 insertions(+), 256 deletions(-) delete mode 100755 include/constants/bg_event_constants.h create mode 100755 include/constants/event_bg.h create mode 100755 include/constants/event_object_movement.h delete mode 100755 include/constants/event_object_movement_constants.h diff --git a/data/map_events.s b/data/map_events.s index 57423f91b..bd9ac9c99 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,7 +1,7 @@ #include "constants/flags.h" #include "constants/items.h" -#include "constants/bg_event_constants.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_bg.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/secret_bases.h" diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h deleted file mode 100755 index a915bc509..000000000 --- a/include/constants/bg_event_constants.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GUARD_CONSTANTS_BG_EVENT_H -#define GUARD_CONSTANTS_BG_EVENT_H - -#define BG_EVENT_PLAYER_FACING_ANY 0 -#define BG_EVENT_PLAYER_FACING_NORTH 1 -#define BG_EVENT_PLAYER_FACING_SOUTH 2 -#define BG_EVENT_PLAYER_FACING_EAST 3 -#define BG_EVENT_PLAYER_FACING_WEST 4 - -#define BG_EVENT_HIDDEN_ITEM 7 -#define BG_EVENT_SECRET_BASE 8 - -#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/constants/event_bg.h b/include/constants/event_bg.h new file mode 100755 index 000000000..64f3331b8 --- /dev/null +++ b/include/constants/event_bg.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_EVENT_BG_H +#define GUARD_CONSTANTS_EVENT_BG_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h new file mode 100755 index 000000000..a93a2ac05 --- /dev/null +++ b/include/constants/event_object_movement.h @@ -0,0 +1,221 @@ +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x60 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE_1 0x61 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x62 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x65 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x66 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x69 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6D +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x6E +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7D +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x7E +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x81 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x82 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x85 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x86 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 + +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h deleted file mode 100755 index 81d2417a1..000000000 --- a/include/constants/event_object_movement_constants.h +++ /dev/null @@ -1,221 +0,0 @@ -#ifndef GUARD_CONSTANTS_EVENTOBJMV_H -#define GUARD_CONSTANTS_EVENTOBJMV_H - -#define MOVEMENT_TYPE_NONE 0x0 -#define MOVEMENT_TYPE_LOOK_AROUND 0x1 -#define MOVEMENT_TYPE_WANDER_AROUND 0x2 -#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 -#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 -#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 -#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 -#define MOVEMENT_TYPE_FACE_UP 0x7 -#define MOVEMENT_TYPE_FACE_DOWN 0x8 -#define MOVEMENT_TYPE_FACE_LEFT 0x9 -#define MOVEMENT_TYPE_FACE_RIGHT 0xA -#define MOVEMENT_TYPE_PLAYER 0xB -#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC -#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD -#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE -#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF -#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 -#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 -#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 -#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 -#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 -#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 -#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 -#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 -#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 -#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 -#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A -#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B -#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 -#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 -#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 -#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 -#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 -#define MOVEMENT_TYPE_COPY_PLAYER 0x35 -#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 -#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 -#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 -#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 -#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A -#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B -#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C -#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D -#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E -#define MOVEMENT_TYPE_HIDDEN 0x3F -#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 -#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 -#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 -#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 -#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 -#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 -#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 -#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 -#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 -#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 -#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A -#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B -#define MOVEMENT_TYPE_INVISIBLE 0x4C - -#define MOVEMENT_ACTION_FACE_DOWN 0x0 -#define MOVEMENT_ACTION_FACE_UP 0x1 -#define MOVEMENT_ACTION_FACE_LEFT 0x2 -#define MOVEMENT_ACTION_FACE_RIGHT 0x3 -#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 -#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 -#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 -#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 -#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 -#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 -#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA -#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB -#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC -#define MOVEMENT_ACTION_JUMP_2_UP 0xD -#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE -#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF -#define MOVEMENT_ACTION_DELAY_1 0x10 -#define MOVEMENT_ACTION_DELAY_2 0x11 -#define MOVEMENT_ACTION_DELAY_4 0x12 -#define MOVEMENT_ACTION_DELAY_8 0x13 -#define MOVEMENT_ACTION_DELAY_16 0x14 -#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 -#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 -#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 -#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B -#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F -#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B -#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C -#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D -#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E -#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F -#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 -#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 -#define MOVEMENT_ACTION_SLIDE_UP 0x32 -#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 -#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 -#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 -#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 -#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 -#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 -#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 -#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A -#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B -#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C -#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D -#define MOVEMENT_ACTION_FACE_PLAYER 0x3E -#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F -#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 -#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 -#define MOVEMENT_ACTION_JUMP_DOWN 0x42 -#define MOVEMENT_ACTION_JUMP_UP 0x43 -#define MOVEMENT_ACTION_JUMP_LEFT 0x44 -#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 -#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A -#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B -#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C -#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D -#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E -#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F -#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 -#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 -#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 -#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 -#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 -#define MOVEMENT_ACTION_SET_VISIBLE 0x55 -#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 -#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 -#define MOVEMENT_ACTION_EMOTE_HEART 0x58 -#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 -#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A -#define MOVEMENT_ACTION_CUT_TREE 0x5B -#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C -#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D -#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E -#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F -#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x60 -#define MOVEMENT_ACTION_WALK_DOWN_AFFINE_1 0x61 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x62 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x63 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x64 -#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x65 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x66 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x67 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x68 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x69 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6A -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6B -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6C -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6D -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x6E -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x6F -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x70 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x71 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x72 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x73 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x74 -#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x75 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x76 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x77 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x78 -#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x79 -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7A -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7B -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7C -#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7D -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x7E -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x7F -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x80 -#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x81 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x82 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x83 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x84 -#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x85 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x86 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x87 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 -#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 - -#endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index eeb18e7cb..0bf530cf7 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H -#define GUARD_CONSTANTS_OBJECT_EVENTS_H +#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H +#define GUARD_CONSTANTS_EVENT_OBJECTS_H #define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 #define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1 @@ -252,4 +252,4 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H +#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 7a293cc01..b2868cf76 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -1,5 +1,5 @@ -#ifndef GUARD_OBJ_EVENT_LOCK_H -#define GUARD_OBJ_EVENT_LOCK_H +#ifndef GUARD_EVENT_OBJ_LOCK_H +#define GUARD_EVENT_OBJ_LOCK_H bool8 walkrun_is_standing_still(void); void sub_8064CDC(u8 taskId); @@ -13,4 +13,4 @@ void unref_sub_8064E5C(void); void sub_8064EAC(void); void sub_8064ED4(void); -#endif // GUARD_OBJ_EVENT_LOCK_H +#endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 949fb87d2..8a28be8ae 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_EVENTOBJMV_H -#define GUARD_EVENTOBJMV_H +#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H +#define GUARD_EVENT_OBJECT_MOVEMENT_H #include "sprite.h" @@ -463,4 +463,4 @@ u8 ZCoordToPriority(u8); void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -#endif // GUARD_EVENTOBJMV_H +#endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/src/berry.c b/src/berry.c index b76fc34c4..f1bdb5235 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,7 +11,7 @@ #include "random.h" #include "task.h" #include "text.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/items.h" #ifdef ENGLISH diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c6ce76195..7cffdcbc0 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -15,7 +15,7 @@ #include "trainer_see.h" #include "constants/field_effects.h" #include "constants/maps.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index d5bdab053..bca856e9e 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -24,7 +24,7 @@ #include "trainer_see.h" #include "constants/vars.h" #include "wild_encounter.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/map_types.h" struct Coords32 diff --git a/src/field_effect.c b/src/field_effect.c index 5c26b647c..a85b32049 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -24,7 +24,7 @@ #include "text.h" #include "trig.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/songs.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index d0773cead..a87c32dbe 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -19,7 +19,7 @@ #include "sound.h" #include "start_menu.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/songs.h" void sub_8080B9C(u8); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 4657593e6..324dab9c8 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -20,7 +20,7 @@ #include "task.h" #include "tv.h" #include "wild_encounter.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/moves.h" diff --git a/src/field_specials.c b/src/field_specials.c index 491578369..972b63a0d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -33,7 +33,7 @@ #include "pokemon_summary_screen.h" #include "random.h" #include "constants/abilities.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/metatile_labels.h" #include "constants/moves.h" #include "constants/species.h" diff --git a/src/item_use.c b/src/item_use.c index 17a17327d..6659bd6d2 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -34,7 +34,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/map_types.h" #include "constants/species.h" #include "constants/vars.h" diff --git a/src/rom6.c b/src/rom6.c index c81e7d1bc..af823ae9c 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -11,7 +11,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/map_types.h" diff --git a/src/secret_base.c b/src/secret_base.c index 795696a13..097d95cfe 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -29,7 +29,7 @@ #include "strings.h" #include "task.h" #include "text.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/decorations.h" #include "constants/items.h" #include "constants/map_types.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index 109bc612c..5fc0a346d 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -8,7 +8,7 @@ #include "sprite.h" #include "task.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" static bool8 CheckTrainer(u8); -- cgit v1.2.3