Merge with master

2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
--- a/include/constants/bg_event_constants.h
+++ 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
--- a/include/constants/event_object_movement_constants.h
+++ b/include/constants/event_object_movement_constants.h
@@ -0,0 +1,245 @@
+#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_TYPE_WALK_SLOWLY_IN_PLACE_DOWN        0x4D
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP          0x4E
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT        0x4F
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT       0x50
+
+#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_UNKNOWN1                        0x60
+#define MOVEMENT_ACTION_UNKNOWN2                        0x61
+#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE          0x62
+#define MOVEMENT_ACTION_WALK_DOWN_AFFINE                0x63
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN          0x64
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP            0x65
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT          0x66
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT         0x67
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN           0x68
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP             0x69
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT           0x6A
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT          0x6B
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN      0x6C
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP        0x6D
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT      0x6E
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT     0x6F
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN      0x70
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP        0x71
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT      0x72
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT     0x73
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN           0x74
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP             0x75
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT           0x76
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT          0x77
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN          0x78
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP            0x79
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT          0x7A
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT         0x7B
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN      0x7C
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP        0x7D
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT      0x7E
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT     0x7F
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN      0x80
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP        0x81
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT      0x82
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT     0x83
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN          0x84
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP            0x85
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT          0x86
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT         0x87
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN      0x88
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP        0x89
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT      0x8A
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT     0x8B
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT    0x8C
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT   0x8D
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT  0x8E
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT      0x90
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT     0x91
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT    0x92
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT   0x93
+#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM             0x94
+#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM            0x95
+#define MOVEMENT_ACTION_WALK_LEFT_AFFINE                0x96
+#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE               0x97
+#define MOVEMENT_ACTION_LEVITATE                        0x98
+#define MOVEMENT_ACTION_STOP_LEVITATE                   0x99
+#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP    0x9A
+#define MOVEMENT_ACTION_FIGURE_8                        0x9B
+#define MOVEMENT_ACTION_FLY_UP                          0x9C
+#define MOVEMENT_ACTION_FLY_DOWN                        0x9D
+
+#endif // GUARD_CONSTANTS_EVENTOBJMV_H
--- a/include/constants/map_types.h
+++ 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_FRONTIER     8
+
+#endif  // GUARD_CONSTANTS_MAP_TYPES_H
--- a/include/constants/secret_bases.h
+++ b/include/constants/secret_bases.h
@@ -0,0 +1,110 @@
+#ifndef GUARD_CONSTANTS_SECRET_BASES_H
+#define GUARD_CONSTANTS_SECRET_BASES_H
+
+// Each secret base location is assigned an identifier value.
+// The secret base's map is determined by (id / 10). The ones
+// digit is used to differentiate secret bases using the same map.
+// Therefore, each secret base map can be used by up to 10 different
+// secret bases in the game. These ids are 1-based, but there is no
+// apparent reason for that.
+
+#define SECRET_BASE_RED_CAVE1_1     1
+#define SECRET_BASE_RED_CAVE1_2     2
+#define SECRET_BASE_RED_CAVE1_3     3
+
+#define SECRET_BASE_RED_CAVE2_1     11
+#define SECRET_BASE_RED_CAVE2_2     12
+#define SECRET_BASE_RED_CAVE2_3     13
+
+#define SECRET_BASE_RED_CAVE3_1     21
+#define SECRET_BASE_RED_CAVE3_2     22
+#define SECRET_BASE_RED_CAVE3_3     23
+
+#define SECRET_BASE_RED_CAVE4_1     31
+#define SECRET_BASE_RED_CAVE4_2     32
+#define SECRET_BASE_RED_CAVE4_3     33
+
+#define SECRET_BASE_BROWN_CAVE1_1   41
+#define SECRET_BASE_BROWN_CAVE1_2   42
+#define SECRET_BASE_BROWN_CAVE1_3   43
+
+#define SECRET_BASE_BROWN_CAVE2_1   51
+#define SECRET_BASE_BROWN_CAVE2_2   52
+#define SECRET_BASE_BROWN_CAVE2_3   53
+
+#define SECRET_BASE_BROWN_CAVE3_1   61
+#define SECRET_BASE_BROWN_CAVE3_2   62
+#define SECRET_BASE_BROWN_CAVE3_3   63
+
+#define SECRET_BASE_BROWN_CAVE4_1   71
+#define SECRET_BASE_BROWN_CAVE4_2   72
+#define SECRET_BASE_BROWN_CAVE4_3   73
+
+#define SECRET_BASE_BLUE_CAVE1_1    81
+#define SECRET_BASE_BLUE_CAVE1_2    82
+#define SECRET_BASE_BLUE_CAVE1_3    83
+
+#define SECRET_BASE_BLUE_CAVE2_1    91
+#define SECRET_BASE_BLUE_CAVE2_2    92
+#define SECRET_BASE_BLUE_CAVE2_3    93
+
+#define SECRET_BASE_BLUE_CAVE3_1    101
+#define SECRET_BASE_BLUE_CAVE3_2    102
+#define SECRET_BASE_BLUE_CAVE3_3    103
+
+#define SECRET_BASE_BLUE_CAVE4_1    111
+#define SECRET_BASE_BLUE_CAVE4_2    112
+#define SECRET_BASE_BLUE_CAVE4_3    113
+
+#define SECRET_BASE_YELLOW_CAVE1_1  121
+#define SECRET_BASE_YELLOW_CAVE1_2  122
+#define SECRET_BASE_YELLOW_CAVE1_3  123
+
+#define SECRET_BASE_YELLOW_CAVE2_1  131
+#define SECRET_BASE_YELLOW_CAVE2_2  132
+#define SECRET_BASE_YELLOW_CAVE2_3  133
+
+#define SECRET_BASE_YELLOW_CAVE3_1  141
+#define SECRET_BASE_YELLOW_CAVE3_2  142
+#define SECRET_BASE_YELLOW_CAVE3_3  143
+
+#define SECRET_BASE_YELLOW_CAVE4_1  151
+#define SECRET_BASE_YELLOW_CAVE4_2  152
+#define SECRET_BASE_YELLOW_CAVE4_3  153
+
+#define SECRET_BASE_TREE1_1         161
+#define SECRET_BASE_TREE1_2         162
+#define SECRET_BASE_TREE1_3         163
+#define SECRET_BASE_TREE1_4         164
+
+#define SECRET_BASE_TREE2_1         171
+#define SECRET_BASE_TREE2_2         172
+#define SECRET_BASE_TREE2_3         173
+#define SECRET_BASE_TREE2_4         174
+
+#define SECRET_BASE_TREE3_1         181
+#define SECRET_BASE_TREE3_2         182
+#define SECRET_BASE_TREE3_3         183
+
+#define SECRET_BASE_TREE4_1         191
+#define SECRET_BASE_TREE4_2         192
+#define SECRET_BASE_TREE4_3         193
+
+#define SECRET_BASE_SHRUB1_1        201
+#define SECRET_BASE_SHRUB1_2        202
+#define SECRET_BASE_SHRUB1_3        203
+#define SECRET_BASE_SHRUB1_4        204
+
+#define SECRET_BASE_SHRUB2_1        211
+#define SECRET_BASE_SHRUB2_2        212
+#define SECRET_BASE_SHRUB2_3        213
+
+#define SECRET_BASE_SHRUB3_1        221
+#define SECRET_BASE_SHRUB3_2        222
+#define SECRET_BASE_SHRUB3_3        223
+
+#define SECRET_BASE_SHRUB4_1        231
+#define SECRET_BASE_SHRUB4_2        232
+#define SECRET_BASE_SHRUB4_3        233
+
+#endif  // GUARD_CONSTANTS_SECRET_BASES_H
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -4,253 +4,6 @@
 #define NUM_OBJECT_GRAPHICS_INFO 239
 #define SPRITE_VAR 240

-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,
-    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN,
-    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP,
-    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT,
-    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT,
-};
-
-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_UNKNOWN1,
-    MOVEMENT_ACTION_UNKNOWN2,
-    MOVEMENT_ACTION_WALK_DOWN_START_AFFINE,
-    MOVEMENT_ACTION_WALK_DOWN_AFFINE,
-    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,
-    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT,
-    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT,
-    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT,
-    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT,
-    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT,
-    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT,
-    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT,
-    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT,
-    MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
-    MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
-    MOVEMENT_ACTION_WALK_LEFT_AFFINE,
-    MOVEMENT_ACTION_WALK_RIGHT_AFFINE,
-    MOVEMENT_ACTION_LEVITATE,
-    MOVEMENT_ACTION_STOP_LEVITATE,
-    MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP,
-    MOVEMENT_ACTION_FIGURE_8,
-    MOVEMENT_ACTION_FLY_UP,
-    MOVEMENT_ACTION_FLY_DOWN,
-};
-
 enum SpinnerRunnerFollowPatterns
 {
    RUNFOLLOW_ANY,
@@ -351,7 +104,7 @@ void TrySpawnEventObjects(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
-u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialEventObjectParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -545,6 +545,35 @@
 #define BGCNT_AFF512x512        0x8000
 #define BGCNT_AFF1024x1024      0xC000

+// WININ/OUT
+#define WININ_WIN0_BG0      (1 << 0)
+#define WININ_WIN0_BG1      (1 << 1)
+#define WININ_WIN0_BG2      (1 << 2)
+#define WININ_WIN0_BG3      (1 << 3)
+#define WININ_WIN0_OBJ      (1 << 4)
+#define WININ_WIN0_CLR      (1 << 5)
+#define WININ_WIN1_BG0      (1 << 8)
+#define WININ_WIN1_BG1      (1 << 9)
+#define WININ_WIN1_BG2      (1 << 10)
+#define WININ_WIN1_BG3      (1 << 11)
+#define WININ_WIN1_OBJ      (1 << 12)
+#define WININ_WIN1_CLR      (1 << 13)
+
+#define WINOUT_WIN01_BG0    (1 << 0)
+#define WINOUT_WIN01_BG1    (1 << 1)
+#define WINOUT_WIN01_BG2    (1 << 2)
+#define WINOUT_WIN01_BG3    (1 << 3)
+#define WINOUT_WIN01_OBJ    (1 << 4)
+#define WINOUT_WIN01_CLR    (1 << 5)
+#define WINOUT_WINOBJ_BG0   (1 << 8)
+#define WINOUT_WINOBJ_BG1   (1 << 9)
+#define WINOUT_WINOBJ_BG2   (1 << 10)
+#define WINOUT_WINOBJ_BG3   (1 << 11)
+#define WINOUT_WINOBJ_OBJ   (1 << 12)
+#define WINOUT_WINOBJ_CLR   (1 << 13)
+
+#define WINHV_COORDS(m, n)     (((m) << 8) | (n))
+
 // BLDCNT
 // Bits 0-5 select layers for the 1st target
 #define BLDCNT_TGT1_BG0      (1 << 0)
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -13,35 +13,6 @@ enum
    CONNECTION_EMERGE
 };

-// map types
-enum
-{
-    MAP_TYPE_0,
-    MAP_TYPE_TOWN,
-    MAP_TYPE_CITY,
-    MAP_TYPE_ROUTE,
-    MAP_TYPE_UNDERGROUND,
-    MAP_TYPE_UNDERWATER,
-    MAP_TYPE_6,
-    MAP_TYPE_7,
-    MAP_TYPE_INDOOR,
-    MAP_TYPE_SECRET_BASE
-};
-
-// 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_FRONTIER,     // 8
-};
-
 typedef void (*TilesetCB)(void);

 struct Tileset
--- a/include/link.h
+++ b/include/link.h
@@ -201,7 +201,7 @@ extern u32 gLinkStatus;

 void c2_mystery_gift(void);
 void sub_801867C(void);
-bool8 sub_80093CC(void);
+bool8 IsWirelessAdapterConnected(void);
 void Task_DestroySelf(u8 taskId);
 void OpenLink(void);
 void CloseLink(void);
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -3,11 +3,19 @@

 #define LIST_NOTHING_CHOSEN -1
 #define LIST_B_PRESSED -2
+#define LIST_HEADER -3

 #define LIST_NO_MULTIPLE_SCROLL     0
 #define LIST_MULTIPLE_SCROLL_DPAD   1
 #define LIST_MULTIPLE_SCROLL_L_R    2

+enum {
+    SCROLL_ARROW_LEFT,
+    SCROLL_ARROW_RIGHT,
+    SCROLL_ARROW_UP,
+    SCROLL_ARROW_DOWN
+};
+
 struct ListMenu;

 struct ListMenuItem
@@ -19,20 +27,20 @@ struct ListMenuItem
 struct ListMenuTemplate
 {
    const struct ListMenuItem *items;
-    void (* moveCursorFunc)(s32, bool8, struct ListMenu *);
-    void (* unk_08)(u8 windowId, s32 itemId, u8 y);
+    void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+    void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
    u16 totalItems;
    u16 maxShowed;
    u8 windowId;
-    u8 unk_11;
-    u8 unk_12;
+    u8 header_X;
+    u8 item_X;
    u8 cursor_X;
    u8 upText_Y:4; // x1, x2, x4, x8 = xF
    u8 cursorPal:4; // x10, x20, x40, x80 = xF0
    u8 fillValue:4; // x1, x2, x4, x8 = xF
    u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
    u8 lettersSpacing:3;
-    u8 unk_16_3:3;
+    u8 itemVerticalPadding:3;
    u8 scrollMultiple:2; // x40, x80 = xC0
    u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
    u8 cursorKind:2; // x40, x80
@@ -45,11 +53,11 @@ struct ListMenu
    u16 selectedRow;
    u8 unk_1C;
    u8 unk_1D;
-    u8 unk_1E;
+    u8 taskId;
    u8 unk_1F;
 };

-struct UnknownListMenuWindowStruct
+struct ListMenuWindowRect
 {
    u8 x;
    u8 y;
@@ -58,16 +66,16 @@ struct UnknownListMenuWindowStruct
    u8 palNum;
 };

-struct ArrowStruct
+struct ScrollArrowsTemplate
 {
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-    u8 unk3;
-    u8 unk4;
-    u8 unk5;
-    u16 unk6;
-    u16 unk8;
+    u8 firstArrowType;
+    u8 firstX;
+    u8 firstY;
+    u8 secondArrowType;
+    u8 secondX;
+    u8 secondY;
+    u16 fullyUpThreshold;
+    u16 fullyDownThreshold;
    u16 tileTag;
    u16 palTag;
    u8 palNum;
@@ -75,36 +83,36 @@ struct ArrowStruct

 struct CursorStruct
 {
-    u8 unk0;
-    u8 unk1;
-    u16 unk2;
-    u16 unk4;
+    u8 left;
+    u8 top;
+    u16 rowWidth;
+    u16 rowHeight;
    u16 tileTag;
    u16 palTag;
    u8 palNum;
 };

-extern struct ArrowStruct gUnknown_0203CE8C;
+extern struct ScrollArrowsTemplate gTempScrollArrowTemplate;
 extern struct ListMenuTemplate gMultiuseListMenuTemplate;

 s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
 u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
-u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow);
+u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *arg1, u16 scrollOffset, u16 selectedRow);
 s32 ListMenuHandleInputGetItemId(u8 listTaskId);
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
-void sub_81AE70C(u8 listTaskId);
+void RedrawListMenu(u8 listTaskId);
 void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
 void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y);
 s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow);
 void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId);
 void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
-void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
-void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list);
-s32 sub_81AF08C(u8 taskId, u8 field);
-void sub_81AF15C(u8 taskId, u8 field, s32 value);
-u8 AddScrollIndicatorArrowPair(const struct ArrowStruct *arrowInfo, u16 *arg1);
-u8 AddScrollIndicatorArrowPairParametrized(u32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 tileTag, s32 palTag, void *arg7);
+void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
+void ListMenuDefaultCursorMoveFunc(s32 arg0, u8 arg1, struct ListMenu *list);
+s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field);
+void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
+u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *arg1);
+u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr);
 void RemoveScrollIndicatorArrowPair(u8 taskId);
 void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId);

--- a/include/palette.h
+++ b/include/palette.h
@@ -24,16 +24,16 @@ struct PaletteFadeControl
    u16 y:5; // blend coefficient
    u16 targetY:5; // target blend coefficient
    u16 blendColor:15;
-    u16 active:1;
+    bool16 active:1;
    u16 multipurpose2:6;
-    u16 yDec:1; // whether blend coefficient is decreasing
-    u16 bufferTransferDisabled:1;
+    bool16 yDec:1; // whether blend coefficient is decreasing
+    bool16 bufferTransferDisabled:1;
    u16 mode:2;
-    u16 shouldResetBlendRegisters:1;
-    u16 hardwareFadeFinishing:1;
+    bool16 shouldResetBlendRegisters:1;
+    bool16 hardwareFadeFinishing:1;
    u16 softwareFadeFinishingCounter:5;
-    u16 softwareFadeFinishing:1;
-    u16 objPaletteToggle:1;
+    bool16 softwareFadeFinishing:1;
+    bool16 objPaletteToggle:1;
    u8 deltaY:4; // rate of change of blend coefficient
 };

--- a/include/sprite.h
+++ b/include/sprite.h
@@ -2,6 +2,7 @@
 #define GUARD_SPRITE_H

 #define MAX_SPRITES 64
+#define SPRITE_INVALID_TAG 0xFFFF

 struct SpriteSheet
 {
@@ -186,29 +187,29 @@ struct Sprite
    /*0x2A*/ u8 animNum;
    /*0x2B*/ u8 animCmdIndex;
    /*0x2C*/ u8 animDelayCounter:6;
-             u8 animPaused:1;
-             u8 affineAnimPaused:1;
+             bool8 animPaused:1;
+             bool8 affineAnimPaused:1;
    /*0x2D*/ u8 animLoopCounter;

    // general purpose data fields
    /*0x2E*/ s16 data[8];

-    /*0x3E*/ u16 inUse:1;               //1
-             u16 coordOffsetEnabled:1;  //2
-             u16 invisible:1;           //4
-             u16 flags_3:1;             //8
-             u16 flags_4:1;             //0x10
-             u16 flags_5:1;             //0x20
-             u16 flags_6:1;             //0x40
-             u16 flags_7:1;             //0x80
-    /*0x3F*/ u16 hFlip:1;               //1
-             u16 vFlip:1;               //2
-             u16 animBeginning:1;       //4
-             u16 affineAnimBeginning:1; //8
-             u16 animEnded:1;           //0x10
-             u16 affineAnimEnded:1;     //0x20
-             u16 usingSheet:1;          //0x40
-             u16 flags_f:1;             //0x80
+    /*0x3E*/ bool16 inUse:1;               //1
+             bool16 coordOffsetEnabled:1;  //2
+             bool16 invisible:1;           //4
+             bool16 flags_3:1;             //8
+             bool16 flags_4:1;             //0x10
+             bool16 flags_5:1;             //0x20
+             bool16 flags_6:1;             //0x40
+             bool16 flags_7:1;             //0x80
+    /*0x3F*/ bool16 hFlip:1;               //1
+             bool16 vFlip:1;               //2
+             bool16 animBeginning:1;       //4
+             bool16 affineAnimBeginning:1; //8
+             bool16 animEnded:1;           //0x10
+             bool16 affineAnimEnded:1;     //0x20
+             bool16 usingSheet:1;          //0x40
+             bool16 flags_f:1;             //0x80

    /*0x40*/ u16 sheetTileStart;

--- a/include/text.h
+++ b/include/text.h
@@ -108,6 +108,17 @@

 #define TEXT_SPEED_FF 0xFF

+enum {
+    FONTATTR_MAX_LETTER_WIDTH,
+    FONTATTR_MAX_LETTER_HEIGHT,
+    FONTATTR_LETTER_SPACING,
+    FONTATTR_LINE_SPACING,
+    FONTATTR_COLOR_LOWNIBBLE,   // dunno what this is yet
+    FONTATTR_COLOR_FOREGROUND,
+    FONTATTR_COLOR_BACKGROUND,
+    FONTATTR_COLOR_SHADOW
+};
+
 struct TextPrinterSubStruct
 {
    u8 font_type:4;  // 0x14
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -12,11 +12,11 @@ struct TilesPal
 extern const u8 gTextWindowFrame1_Gfx[];
 extern const u16 gTextWindowFrame1_Pal[];

-const struct TilesPal* GetWindowFrameTilesPal(u8 id);
+const struct TilesPal *GetWindowFrameTilesPal(u8 id);
 void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset);
-void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset);
+void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset);
 void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
-void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset);
+void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset);
 void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
 void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
 void rbox_fill_rectangle(u8 windowId);