Merge pull request #654 from huderlem/movement_constants

Move and use movement constants

7 files changed, 363 insertions, 352 deletions

diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h
new file mode 100755
index 000000000..a915bc509
--- /dev/null
+++ b/include/constants/bg_event_constants.h
@@ -0,0 +1,13 @@
+#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_object_movement_constants.h b/include/constants/event_object_movement_constants.h
new file mode 100755
index 000000000..81d2417a1
--- /dev/null
+++ b/include/constants/event_object_movement_constants.h
@@ -0,0 +1,221 @@
+#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/map_types.h b/include/constants/map_types.h
new file mode 100755
index 000000000..cc9ecf8a3
--- /dev/null
+++ b/include/constants/map_types.h
@@ -0,0 +1,25 @@
+#ifndef GUARD_CONSTANTS_MAP_TYPES_H
+#define GUARD_CONSTANTS_MAP_TYPES_H
+
+#define MAP_TYPE_0           0
+#define MAP_TYPE_TOWN        1
+#define MAP_TYPE_CITY        2
+#define MAP_TYPE_ROUTE       3
+#define MAP_TYPE_UNDERGROUND 4
+#define MAP_TYPE_UNDERWATER  5
+#define MAP_TYPE_6           6
+#define MAP_TYPE_7           7
+#define MAP_TYPE_INDOOR      8
+#define MAP_TYPE_SECRET_BASE 9
+
+#define MAP_BATTLE_SCENE_NORMAL       0
+#define MAP_BATTLE_SCENE_GYM          1
+#define MAP_BATTLE_SCENE_MAGMA        2
+#define MAP_BATTLE_SCENE_AQUA         3
+#define MAP_BATTLE_SCENE_SIDNEY       4
+#define MAP_BATTLE_SCENE_PHOEBE       5
+#define MAP_BATTLE_SCENE_GLACIA       6
+#define MAP_BATTLE_SCENE_DRAKE        7
+#define MAP_BATTLE_SCENE_BATTLE_TOWER 8
+
+#endif  // GUARD_CONSTANTS_MAP_TYPES_H
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 38ca06e1b..254ae2edd 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -1,97 +1,94 @@
 #ifndef GUARD_REGIONMAPSEC_H
 #define GUARD_REGIONMAPSEC_H
 
-enum
-{
-    MAPSEC_LITTLEROOT_TOWN,           // 0x00
-    MAPSEC_OLDALE_TOWN,               // 0x01
-    MAPSEC_DEWFORD_TOWN,              // 0x02
-    MAPSEC_LAVARIDGE_TOWN,            // 0x03
-    MAPSEC_FALLARBOR_TOWN,            // 0x04
-    MAPSEC_VERDANTURF_TOWN,           // 0x05
-    MAPSEC_PACIFIDLOG_TOWN,           // 0x06
-    MAPSEC_PETALBURG_CITY,            // 0x07
-    MAPSEC_SLATEPORT_CITY,            // 0x08
-    MAPSEC_MAUVILLE_CITY,             // 0x09
-    MAPSEC_RUSTBORO_CITY,             // 0x0A
-    MAPSEC_FORTREE_CITY,              // 0x0B
-    MAPSEC_LILYCOVE_CITY,             // 0x0C
-    MAPSEC_MOSSDEEP_CITY,             // 0x0D
-    MAPSEC_SOOTOPOLIS_CITY,           // 0x0E
-    MAPSEC_EVER_GRANDE_CITY,          // 0x0F
-    MAPSEC_ROUTE_101,                 // 0x10
-    MAPSEC_ROUTE_102,                 // 0x11
-    MAPSEC_ROUTE_103,                 // 0x12
-    MAPSEC_ROUTE_104,                 // 0x13
-    MAPSEC_ROUTE_105,                 // 0x14
-    MAPSEC_ROUTE_106,                 // 0x15
-    MAPSEC_ROUTE_107,                 // 0x16
-    MAPSEC_ROUTE_108,                 // 0x17
-    MAPSEC_ROUTE_109,                 // 0x18
-    MAPSEC_ROUTE_110,                 // 0x19
-    MAPSEC_ROUTE_111,                 // 0x1A
-    MAPSEC_ROUTE_112,                 // 0x1B
-    MAPSEC_ROUTE_113,                 // 0x1C
-    MAPSEC_ROUTE_114,                 // 0x1D
-    MAPSEC_ROUTE_115,                 // 0x1E
-    MAPSEC_ROUTE_116,                 // 0x1F
-    MAPSEC_ROUTE_117,                 // 0x20
-    MAPSEC_ROUTE_118,                 // 0x21
-    MAPSEC_ROUTE_119,                 // 0x22
-    MAPSEC_ROUTE_120,                 // 0x23
-    MAPSEC_ROUTE_121,                 // 0x24
-    MAPSEC_ROUTE_122,                 // 0x25
-    MAPSEC_ROUTE_123,                 // 0x26
-    MAPSEC_ROUTE_124,                 // 0x27
-    MAPSEC_ROUTE_125,                 // 0x28
-    MAPSEC_ROUTE_126,                 // 0x29
-    MAPSEC_ROUTE_127,                 // 0x2A
-    MAPSEC_ROUTE_128,                 // 0x2B
-    MAPSEC_ROUTE_129,                 // 0x2C
-    MAPSEC_ROUTE_130,                 // 0x2D
-    MAPSEC_ROUTE_131,                 // 0x2E
-    MAPSEC_ROUTE_132,                 // 0x2F
-    MAPSEC_ROUTE_133,                 // 0x30
-    MAPSEC_ROUTE_134,                 // 0x31
-    MAPSEC_UNDERWATER_124,            // 0x32
-    MAPSEC_UNDERWATER_125,            // 0x33
-    MAPSEC_UNDERWATER_126,            // 0x34
-    MAPSEC_UNDERWATER_127,            // 0x35
-    MAPSEC_UNDERWATER_SOOTOPOLIS,     // 0x36
-    MAPSEC_GRANITE_CAVE,              // 0x37
-    MAPSEC_MT_CHIMNEY,                // 0x38
-    MAPSEC_SAFARI_ZONE,               // 0x39
-    MAPSEC_BATTLE_TOWER,              // 0x3A
-    MAPSEC_PETALBURG_WOODS,           // 0x3B
-    MAPSEC_RUSTURF_TUNNEL,            // 0x3C
-    MAPSEC_ABANDONED_SHIP,            // 0x3D
-    MAPSEC_NEW_MAUVILLE,              // 0x3E
-    MAPSEC_METEOR_FALLS,              // 0x3F
-    MAPSEC_METEOR_FALLS_2,            // 0x40
-    MAPSEC_MT_PYRE,                   // 0x41
-    MAPSEC_EVIL_TEAM_HIDEOUT,         // 0x42
-    MAPSEC_SHOAL_CAVE,                // 0x43
-    MAPSEC_SEAFLOOR_CAVERN,           // 0x44
-    MAPSEC_UNDERWATER_128,            // 0x45
-    MAPSEC_VICTORY_ROAD,              // 0x46
-    MAPSEC_MIRAGE_ISLAND,             // 0x47
-    MAPSEC_CAVE_OF_ORIGIN,            // 0x48
-    MAPSEC_SOUTHERN_ISLAND,           // 0x49
-    MAPSEC_FIERY_PATH,                // 0x4A
-    MAPSEC_FIERY_PATH_2,              // 0x4B
-    MAPSEC_JAGGED_PASS,               // 0x4C
-    MAPSEC_JAGGED_PASS_2,             // 0x4D
-    MAPSEC_SEALED_CHAMBER,            // 0x4E
-    MAPSEC_UNDERWATER_SEALED_CHAMBER, // 0x4F
-    MAPSEC_SCORCHED_SLAB,             // 0x50
-    MAPSEC_ISLAND_CAVE,               // 0x51
-    MAPSEC_DESERT_RUINS,              // 0x52
-    MAPSEC_ANCIENT_TOMB,              // 0x53
-    MAPSEC_INSIDE_OF_TRUCK,           // 0x54
-    MAPSEC_SKY_PILLAR,                // 0x55
-    MAPSEC_SECRET_BASE,               // 0x56
-    MAPSEC_DYNAMIC,                   // 0x57
-    MAPSEC_NOTHING                    // 0x58
-};
+#define MAPSEC_LITTLEROOT_TOWN       0x00
+#define MAPSEC_OLDALE_TOWN           0x01
+#define MAPSEC_DEWFORD_TOWN          0x02
+#define MAPSEC_LAVARIDGE_TOWN        0x03
+#define MAPSEC_FALLARBOR_TOWN        0x04
+#define MAPSEC_VERDANTURF_TOWN       0x05
+#define MAPSEC_PACIFIDLOG_TOWN       0x06
+#define MAPSEC_PETALBURG_CITY        0x07
+#define MAPSEC_SLATEPORT_CITY        0x08
+#define MAPSEC_MAUVILLE_CITY         0x09
+#define MAPSEC_RUSTBORO_CITY         0x0A
+#define MAPSEC_FORTREE_CITY          0x0B
+#define MAPSEC_LILYCOVE_CITY         0x0C
+#define MAPSEC_MOSSDEEP_CITY         0x0D
+#define MAPSEC_SOOTOPOLIS_CITY       0x0E
+#define MAPSEC_EVER_GRANDE_CITY      0x0F
+#define MAPSEC_ROUTE_101             0x10
+#define MAPSEC_ROUTE_102             0x11
+#define MAPSEC_ROUTE_103             0x12
+#define MAPSEC_ROUTE_104             0x13
+#define MAPSEC_ROUTE_105             0x14
+#define MAPSEC_ROUTE_106             0x15
+#define MAPSEC_ROUTE_107             0x16
+#define MAPSEC_ROUTE_108             0x17
+#define MAPSEC_ROUTE_109             0x18
+#define MAPSEC_ROUTE_110             0x19
+#define MAPSEC_ROUTE_111             0x1A
+#define MAPSEC_ROUTE_112             0x1B
+#define MAPSEC_ROUTE_113             0x1C
+#define MAPSEC_ROUTE_114             0x1D
+#define MAPSEC_ROUTE_115             0x1E
+#define MAPSEC_ROUTE_116             0x1F
+#define MAPSEC_ROUTE_117             0x20
+#define MAPSEC_ROUTE_118             0x21
+#define MAPSEC_ROUTE_119             0x22
+#define MAPSEC_ROUTE_120             0x23
+#define MAPSEC_ROUTE_121             0x24
+#define MAPSEC_ROUTE_122             0x25
+#define MAPSEC_ROUTE_123             0x26
+#define MAPSEC_ROUTE_124             0x27
+#define MAPSEC_ROUTE_125             0x28
+#define MAPSEC_ROUTE_126             0x29
+#define MAPSEC_ROUTE_127             0x2A
+#define MAPSEC_ROUTE_128             0x2B
+#define MAPSEC_ROUTE_129             0x2C
+#define MAPSEC_ROUTE_130             0x2D
+#define MAPSEC_ROUTE_131             0x2E
+#define MAPSEC_ROUTE_132             0x2F
+#define MAPSEC_ROUTE_133             0x30
+#define MAPSEC_ROUTE_134             0x31
+#define MAPSEC_UNDERWATER_124        0x32
+#define MAPSEC_UNDERWATER_125        0x33
+#define MAPSEC_UNDERWATER_126        0x34
+#define MAPSEC_UNDERWATER_127        0x35
+#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36
+#define MAPSEC_GRANITE_CAVE          0x37
+#define MAPSEC_MT_CHIMNEY            0x38
+#define MAPSEC_SAFARI_ZONE           0x39
+#define MAPSEC_BATTLE_TOWER          0x3A
+#define MAPSEC_PETALBURG_WOODS       0x3B
+#define MAPSEC_RUSTURF_TUNNEL        0x3C
+#define MAPSEC_ABANDONED_SHIP        0x3D
+#define MAPSEC_NEW_MAUVILLE          0x3E
+#define MAPSEC_METEOR_FALLS          0x3F
+#define MAPSEC_METEOR_FALLS_2        0x40
+#define MAPSEC_MT_PYRE               0x41
+#define MAPSEC_EVIL_TEAM_HIDEOUT     0x42
+#define MAPSEC_SHOAL_CAVE            0x43
+#define MAPSEC_SEAFLOOR_CAVERN       0x44
+#define MAPSEC_UNDERWATER_128        0x45
+#define MAPSEC_VICTORY_ROAD          0x46
+#define MAPSEC_MIRAGE_ISLAND         0x47
+#define MAPSEC_CAVE_OF_ORIGIN        0x48
+#define MAPSEC_SOUTHERN_ISLAND       0x49
+#define MAPSEC_FIERY_PATH            0x4A
+#define MAPSEC_FIERY_PATH_2          0x4B
+#define MAPSEC_JAGGED_PASS           0x4C
+#define MAPSEC_JAGGED_PASS_2         0x4D
+#define MAPSEC_SEALED_CHAMBER        0x4E
+#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F
+#define MAPSEC_SCORCHED_SLAB         0x50
+#define MAPSEC_ISLAND_CAVE           0x51
+#define MAPSEC_DESERT_RUINS          0x52
+#define MAPSEC_ANCIENT_TOMB          0x53
+#define MAPSEC_INSIDE_OF_TRUCK       0x54
+#define MAPSEC_SKY_PILLAR            0x55
+#define MAPSEC_SECRET_BASE           0x56
+#define MAPSEC_DYNAMIC               0x57
+#define MAPSEC_NOTHING               0x58
 
 #endif // GUARD_REGIONMAPSEC_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index e1e7529ca..ece46fce0 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -3,227 +3,6 @@
 
 #include "sprite.h"
 
-enum {
-    MOVEMENT_TYPE_NONE,
-    MOVEMENT_TYPE_LOOK_AROUND,
-    MOVEMENT_TYPE_WANDER_AROUND,
-    MOVEMENT_TYPE_WANDER_UP_AND_DOWN,
-    MOVEMENT_TYPE_WANDER_DOWN_AND_UP,
-    MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT,
-    MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT,
-    MOVEMENT_TYPE_FACE_UP,
-    MOVEMENT_TYPE_FACE_DOWN,
-    MOVEMENT_TYPE_FACE_LEFT,
-    MOVEMENT_TYPE_FACE_RIGHT,
-    MOVEMENT_TYPE_PLAYER,
-    MOVEMENT_TYPE_BERRY_TREE_GROWTH,
-    MOVEMENT_TYPE_FACE_DOWN_AND_UP,
-    MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT,
-    MOVEMENT_TYPE_FACE_UP_AND_LEFT,
-    MOVEMENT_TYPE_FACE_UP_AND_RIGHT,
-    MOVEMENT_TYPE_FACE_DOWN_AND_LEFT,
-    MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT,
-    MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT,
-    MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT,
-    MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT,
-    MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT,
-    MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE,
-    MOVEMENT_TYPE_ROTATE_CLOCKWISE,
-    MOVEMENT_TYPE_WALK_UP_AND_DOWN,
-    MOVEMENT_TYPE_WALK_DOWN_AND_UP,
-    MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT,
-    MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT,
-    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN,
-    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP,
-    MOVEMENT_TYPE_COPY_PLAYER,
-    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE,
-    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE,
-    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE,
-    MOVEMENT_TYPE_TREE_DISGUISE,
-    MOVEMENT_TYPE_MOUNTAIN_DISGUISE,
-    MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS,
-    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS,
-    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS,
-    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS,
-    MOVEMENT_TYPE_HIDDEN,
-    MOVEMENT_TYPE_WALK_IN_PLACE_DOWN,
-    MOVEMENT_TYPE_WALK_IN_PLACE_UP,
-    MOVEMENT_TYPE_WALK_IN_PLACE_LEFT,
-    MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT,
-    MOVEMENT_TYPE_JOG_IN_PLACE_DOWN,
-    MOVEMENT_TYPE_JOG_IN_PLACE_UP,
-    MOVEMENT_TYPE_JOG_IN_PLACE_LEFT,
-    MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT,
-    MOVEMENT_TYPE_RUN_IN_PLACE_DOWN,
-    MOVEMENT_TYPE_RUN_IN_PLACE_UP,
-    MOVEMENT_TYPE_RUN_IN_PLACE_LEFT,
-    MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT,
-    MOVEMENT_TYPE_INVISIBLE,
-};
-
-enum {
-    MOVEMENT_ACTION_FACE_DOWN,
-    MOVEMENT_ACTION_FACE_UP,
-    MOVEMENT_ACTION_FACE_LEFT,
-    MOVEMENT_ACTION_FACE_RIGHT,
-    MOVEMENT_ACTION_WALK_SLOW_DOWN,
-    MOVEMENT_ACTION_WALK_SLOW_UP,
-    MOVEMENT_ACTION_WALK_SLOW_LEFT,
-    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
-    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
-    MOVEMENT_ACTION_WALK_NORMAL_UP,
-    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
-    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
-    MOVEMENT_ACTION_JUMP_2_DOWN,
-    MOVEMENT_ACTION_JUMP_2_UP,
-    MOVEMENT_ACTION_JUMP_2_LEFT,
-    MOVEMENT_ACTION_JUMP_2_RIGHT,
-    MOVEMENT_ACTION_DELAY_1,
-    MOVEMENT_ACTION_DELAY_2,
-    MOVEMENT_ACTION_DELAY_4,
-    MOVEMENT_ACTION_DELAY_8,
-    MOVEMENT_ACTION_DELAY_16,
-    MOVEMENT_ACTION_WALK_FAST_DOWN,
-    MOVEMENT_ACTION_WALK_FAST_UP,
-    MOVEMENT_ACTION_WALK_FAST_LEFT,
-    MOVEMENT_ACTION_WALK_FAST_RIGHT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
-    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
-    MOVEMENT_ACTION_WALK_FASTEST_UP,
-    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
-    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
-    MOVEMENT_ACTION_SLIDE_DOWN,
-    MOVEMENT_ACTION_SLIDE_UP,
-    MOVEMENT_ACTION_SLIDE_LEFT,
-    MOVEMENT_ACTION_SLIDE_RIGHT,
-    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
-    MOVEMENT_ACTION_PLAYER_RUN_UP,
-    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
-    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
-    MOVEMENT_ACTION_START_ANIM_IN_DIRECTION,
-    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
-    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
-    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT ,
-    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
-    MOVEMENT_ACTION_FACE_PLAYER,
-    MOVEMENT_ACTION_FACE_AWAY_PLAYER,
-    MOVEMENT_ACTION_LOCK_FACING_DIRECTION,
-    MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,
-    MOVEMENT_ACTION_JUMP_DOWN,
-    MOVEMENT_ACTION_JUMP_UP,
-    MOVEMENT_ACTION_JUMP_LEFT,
-    MOVEMENT_ACTION_JUMP_RIGHT,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
-    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
-    MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION,
-    MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN,
-    MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT,
-    MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT,
-    MOVEMENT_ACTION_DISABLE_ANIMATION,
-    MOVEMENT_ACTION_RESTORE_ANIMATION,
-    MOVEMENT_ACTION_SET_INVISIBLE,
-    MOVEMENT_ACTION_SET_VISIBLE,
-    MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,
-    MOVEMENT_ACTION_EMOTE_QUESTION_MARK,
-    MOVEMENT_ACTION_EMOTE_HEART,
-    MOVEMENT_ACTION_REVEAL_TRAINER,
-    MOVEMENT_ACTION_ROCK_SMASH_BREAK,
-    MOVEMENT_ACTION_CUT_TREE,
-    MOVEMENT_ACTION_SET_FIXED_PRIORITY,
-    MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,
-    MOVEMENT_ACTION_INIT_AFFINE_ANIM,
-    MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,
-    MOVEMENT_ACTION_WALK_DOWN_START_AFFINE,
-    MOVEMENT_ACTION_WALK_DOWN_AFFINE_1,
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
-};
-
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE    (1 << 1)
 #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN   (1 << 2)
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 15766a350..aa13a9ac0 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -11,35 +11,6 @@ enum
     CONNECTION_EMERGE
 };
 
-// map types
-enum
-{
-    MAP_TYPE_0,             // 0
-    MAP_TYPE_TOWN,          // 1
-    MAP_TYPE_CITY,          // 2
-    MAP_TYPE_ROUTE,         // 3
-    MAP_TYPE_UNDERGROUND,   // 4
-    MAP_TYPE_UNDERWATER,    // 5
-    MAP_TYPE_6,             // 6
-    MAP_TYPE_7,             // 7
-    MAP_TYPE_INDOOR,        // 8
-    MAP_TYPE_SECRET_BASE    // 9
-};
-
-// map battle scenes
-enum
-{
-    MAP_BATTLE_SCENE_NORMAL,       // 0
-    MAP_BATTLE_SCENE_GYM,          // 1
-    MAP_BATTLE_SCENE_MAGMA,        // 2
-    MAP_BATTLE_SCENE_AQUA,         // 3
-    MAP_BATTLE_SCENE_SIDNEY,       // 4
-    MAP_BATTLE_SCENE_PHOEBE,       // 5
-    MAP_BATTLE_SCENE_GLACIA,       // 6
-    MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
-};
-
 typedef void (*TilesetCB)(void);
 
 struct Tileset
diff --git a/include/macros/map.inc b/include/macros/map.inc
index bc54271d4..f5f09dea9 100644
--- a/include/macros/map.inc
+++ b/include/macros/map.inc
@@ -34,22 +34,27 @@
 	inc _num_warps
 	.endm
 
-	.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
+	.macro coord_event x, y, elevation, trigger, index, script
 	.2byte \x, \y
-	.byte \byte1, \byte2
-	.2byte \word1, \word2, \word3
+	.byte \elevation, 0
+	.2byte \trigger, \index, 0
 	.4byte \script
 	inc _num_traps
 	.endm
 
-	.macro coord_weather_event x, y, height, weather
-	coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0
+	.macro coord_weather_event x, y, elevation, weather
+	.2byte \x, \y
+	.byte \elevation, 0
+	.2byte \weather
+	.2byte 0, 0
+	.4byte 0
+	inc _num_traps
 	.endm
 
-	.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
+	.macro bg_event x, y, elevation, kind, arg6, arg7, arg8
 	.2byte \x, \y
-	.byte \byte, \kind
-	.2byte \word
+	.byte \elevation, \kind
+	.2byte 0
 	.if \kind < 5
 	.4byte \arg6
 	.else
@@ -60,11 +65,11 @@
 	.endm
 
 	.macro bg_hidden_item_event x, y, height, item, flag
-	bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
+	bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
 	.endm
 
 	.macro bg_secret_base_event x, y, height, secret_base_id
-	bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0
+	bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
 	.endm	
 
 	.macro map_events npcs, warps, traps, signs