Merge branch 'master' into doc-factscreen

13 files changed, 211 insertions, 198 deletions

diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index dfdd9f912..ebc422b18 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -376,7 +376,7 @@
 #define B_ANIM_SWITCH_OUT_PLAYER_MON    0x1
 #define B_ANIM_SWITCH_OUT_OPPONENT_MON  0x2
 #define B_ANIM_BALL_THROW               0x3
-#define B_ANIM_SAFARI_BALL_THROW        0x4
+#define B_ANIM_BALL_THROW_WITH_TRAINER  0x4
 #define B_ANIM_SUBSTITUTE_TO_MON        0x5
 #define B_ANIM_MON_TO_SUBSTITUTE        0x6
 
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
index 1a60714e8..bbe6db81c 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -51,7 +51,7 @@
 #define MAX_BATTLE_FRONTIER_POINTS 9999
 #define MAX_STREAK 9999
 
-// These sets of facility ids would be redunant if the order was consistent
+// These sets of facility ids would be redundant if the order was consistent
 // The order is important for this set so that all the non-link records can be continuous
 #define RANKING_HALL_BATTLE_TOWER_SINGLES   0
 #define RANKING_HALL_BATTLE_TOWER_DOUBLES   1
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index b372c3ad5..f661ddc0b 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -14,7 +14,7 @@
 #define BATTLE_TOWER_FUNC_LOAD_PARTNERS         10
 #define BATTLE_TOWER_FUNC_PARTNER_MSG           11
 #define BATTLE_TOWER_FUNC_LOAD_LINK_OPPONENTS   12
-#define BATTLE_TOWER_FUNC_13                    13
+#define BATTLE_TOWER_FUNC_TRY_CLOSE_LINK        13
 #define BATTLE_TOWER_FUNC_SET_PARTNER_GFX       14
 #define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA    15
 
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index ca312e957..8e026ef2d 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -205,7 +205,7 @@
 #define OBJ_EVENT_GFX_REGICE                     201
 #define OBJ_EVENT_GFX_REGISTEEL                  202
 #define OBJ_EVENT_GFX_SKITTY                     203
-#define OBJ_EVENT_GFX_KECLEON_1                  204
+#define OBJ_EVENT_GFX_KECLEON                    204
 #define OBJ_EVENT_GFX_KYOGRE_2                   205
 #define OBJ_EVENT_GFX_GROUDON_2                  206
 #define OBJ_EVENT_GFX_RAYQUAZA_2                 207
@@ -213,7 +213,7 @@
 #define OBJ_EVENT_GFX_PIKACHU                    209
 #define OBJ_EVENT_GFX_AZUMARILL                  210
 #define OBJ_EVENT_GFX_WINGULL                    211
-#define OBJ_EVENT_GFX_KECLEON_2                  212
+#define OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW      212
 #define OBJ_EVENT_GFX_TUBER_M_SWIMMING           213
 #define OBJ_EVENT_GFX_AZURILL                    214
 #define OBJ_EVENT_GFX_MOM                        215
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 2490a6244..9be269105 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -538,27 +538,27 @@
 // Hidden Items -- sorted by location
 #define FLAG_HIDDEN_ITEMS_START                                                         0x1F4
 #define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET                  (FLAG_HIDDEN_ITEMS_START + 0x01)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS                 (FLAG_HIDDEN_ITEMS_START + 0x08)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD            (FLAG_HIDDEN_ITEMS_START + 0x09)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL                  (FLAG_HIDDEN_ITEMS_START + 0x0A)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL              (FLAG_HIDDEN_ITEMS_START + 0x0B)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1          (FLAG_HIDDEN_ITEMS_START + 0x0D)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM                (FLAG_HIDDEN_ITEMS_START + 0x24)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2          (FLAG_HIDDEN_ITEMS_START + 0x26)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE            (FLAG_HIDDEN_ITEMS_START + 0x0E)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL             (FLAG_HIDDEN_ITEMS_START + 0x0F)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST               (FLAG_HIDDEN_ITEMS_START + 0x10)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL                  (FLAG_HIDDEN_ITEMS_START + 0x11)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON                   (FLAG_HIDDEN_ITEMS_START + 0x13)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x12)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL              (FLAG_HIDDEN_ITEMS_START + 0x14)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD             (FLAG_HIDDEN_ITEMS_START + 0x0C)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE             (FLAG_HIDDEN_ITEMS_START + 0x15)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP                  (FLAG_HIDDEN_ITEMS_START + 0x16)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE            (FLAG_HIDDEN_ITEMS_START + 0x17)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD              (FLAG_HIDDEN_ITEMS_START + 0x18)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN                (FLAG_HIDDEN_ITEMS_START + 0x19)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL                  (FLAG_HIDDEN_ITEMS_START + 0x1A)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS               (FLAG_HIDDEN_ITEMS_START + 0x08)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD          (FLAG_HIDDEN_ITEMS_START + 0x09)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x0A)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x0B)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1        (FLAG_HIDDEN_ITEMS_START + 0x0D)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM              (FLAG_HIDDEN_ITEMS_START + 0x24)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2        (FLAG_HIDDEN_ITEMS_START + 0x26)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x0E)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL           (FLAG_HIDDEN_ITEMS_START + 0x0F)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST             (FLAG_HIDDEN_ITEMS_START + 0x10)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x11)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON                 (FLAG_HIDDEN_ITEMS_START + 0x13)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD         (FLAG_HIDDEN_ITEMS_START + 0x12)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x14)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x0C)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE           (FLAG_HIDDEN_ITEMS_START + 0x15)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP                (FLAG_HIDDEN_ITEMS_START + 0x16)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x17)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD            (FLAG_HIDDEN_ITEMS_START + 0x18)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN              (FLAG_HIDDEN_ITEMS_START + 0x19)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x1A)
 #define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET               (FLAG_HIDDEN_ITEMS_START + 0x1C)
 #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL             (FLAG_HIDDEN_ITEMS_START + 0x00)
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY             (FLAG_HIDDEN_ITEMS_START + 0x1F)
@@ -1012,7 +1012,7 @@
 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN                0x3C7
 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL       0x3C8
 #define FLAG_HIDE_FORTREE_CITY_KECLEON                              0x3C9
-#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE                0x3CA
+#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE                          0x3CA
 #define FLAG_HIDE_LILYCOVE_CITY_RIVAL                               0x3CB
 #define FLAG_HIDE_ROUTE_120_STEVEN                                  0x3CC
 #define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN                            0x3CD
@@ -1023,7 +1023,7 @@
 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2                      0x3D2
 #define FLAG_HIDE_OLDALE_TOWN_RIVAL                                 0x3D3
 #define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE      0x3D4
-#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE                  0x3D5
+#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_SHADOW                   0x3D5
 #define FLAG_HIDE_ROUTE_120_KECLEON_1                               0x3D6
 #define FLAG_HIDE_RUSTURF_TUNNEL_WANDA                              0x3D7
 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA                0x3D8
diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h
index 49fcedc61..6e61c4d7f 100644
--- a/include/constants/item_effects.h
+++ b/include/constants/item_effects.h
@@ -51,6 +51,11 @@
 
 // fields 6 and onwards are item-specific arguments
 
+// Special HP recovery amounts for ITEM4_HEAL_HP
+#define ITEM6_HEAL_FULL   ((u8) -1)
+#define ITEM6_HEAL_HALF   ((u8) -2)
+#define ITEM6_HEAL_LVL_UP ((u8) -3)
+
 // Used for GetItemEffectType.
 #define ITEM_EFFECT_X_ITEM 0
 #define ITEM_EFFECT_RAISE_LEVEL 1
diff --git a/include/constants/items.h b/include/constants/items.h
index 9496a4c61..95c6aacfe 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -497,6 +497,10 @@
 #define MAX_PC_ITEM_CAPACITY   999
 #define MAX_BERRY_CAPACITY     999
 
+#define BAG_ITEM_CAPACITY_DIGITS 2
+#define BERRY_CAPACITY_DIGITS 3
+#define MAX_ITEM_DIGITS BERRY_CAPACITY_DIGITS
+
 // Secondary IDs for rods
 #define OLD_ROD   0
 #define GOOD_ROD  1
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 500b82cd4..9d5e877b0 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -55,9 +55,9 @@
 #define LAYOUT_ROUTE132 48
 #define LAYOUT_ROUTE133 49
 #define LAYOUT_ROUTE134 50
-#define LAYOUT_UNDERWATER2 51
-#define LAYOUT_UNDERWATER3 52
-#define LAYOUT_UNDERWATER4 53
+#define LAYOUT_UNDERWATER_ROUTE126 51
+#define LAYOUT_UNDERWATER_ROUTE127 52
+#define LAYOUT_UNDERWATER_ROUTE128 53
 #define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54
 #define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55
 #define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56
@@ -278,7 +278,7 @@
 #define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271
 #define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272
 #define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273
-#define LAYOUT_UNDERWATER1 274
+#define LAYOUT_UNDERWATER_ROUTE124 274
 #define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275
 #define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276
 #define LAYOUT_SS_TIDAL_CORRIDOR 277
@@ -414,9 +414,9 @@
 #define LAYOUT_MARINE_CAVE_ENTRANCE 407
 #define LAYOUT_TERRA_CAVE_ENTRANCE 408
 #define LAYOUT_TERRA_CAVE_END 409
-#define LAYOUT_UNDERWATER6 410
-#define LAYOUT_UNDERWATER7 411
-#define LAYOUT_UNDERWATER5 412
+#define LAYOUT_UNDERWATER_ROUTE105 410
+#define LAYOUT_UNDERWATER_ROUTE125 411
+#define LAYOUT_UNDERWATER_ROUTE129 412
 #define LAYOUT_MARINE_CAVE_END 413
 #define LAYOUT_TRAINER_HILL_ENTRANCE 414
 #define LAYOUT_TRAINER_HILL_1F 415
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index aef9924fa..69355635b 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -6,63 +6,63 @@
 //
 
 // Map Group 0
-#define MAP_PETALBURG_CITY   (0 | (0 << 8))
-#define MAP_SLATEPORT_CITY   (1 | (0 << 8))
-#define MAP_MAUVILLE_CITY    (2 | (0 << 8))
-#define MAP_RUSTBORO_CITY    (3 | (0 << 8))
-#define MAP_FORTREE_CITY     (4 | (0 << 8))
-#define MAP_LILYCOVE_CITY    (5 | (0 << 8))
-#define MAP_MOSSDEEP_CITY    (6 | (0 << 8))
-#define MAP_SOOTOPOLIS_CITY  (7 | (0 << 8))
-#define MAP_EVER_GRANDE_CITY (8 | (0 << 8))
-#define MAP_LITTLEROOT_TOWN  (9 | (0 << 8))
-#define MAP_OLDALE_TOWN      (10 | (0 << 8))
-#define MAP_DEWFORD_TOWN     (11 | (0 << 8))
-#define MAP_LAVARIDGE_TOWN   (12 | (0 << 8))
-#define MAP_FALLARBOR_TOWN   (13 | (0 << 8))
-#define MAP_VERDANTURF_TOWN  (14 | (0 << 8))
-#define MAP_PACIFIDLOG_TOWN  (15 | (0 << 8))
-#define MAP_ROUTE101         (16 | (0 << 8))
-#define MAP_ROUTE102         (17 | (0 << 8))
-#define MAP_ROUTE103         (18 | (0 << 8))
-#define MAP_ROUTE104         (19 | (0 << 8))
-#define MAP_ROUTE105         (20 | (0 << 8))
-#define MAP_ROUTE106         (21 | (0 << 8))
-#define MAP_ROUTE107         (22 | (0 << 8))
-#define MAP_ROUTE108         (23 | (0 << 8))
-#define MAP_ROUTE109         (24 | (0 << 8))
-#define MAP_ROUTE110         (25 | (0 << 8))
-#define MAP_ROUTE111         (26 | (0 << 8))
-#define MAP_ROUTE112         (27 | (0 << 8))
-#define MAP_ROUTE113         (28 | (0 << 8))
-#define MAP_ROUTE114         (29 | (0 << 8))
-#define MAP_ROUTE115         (30 | (0 << 8))
-#define MAP_ROUTE116         (31 | (0 << 8))
-#define MAP_ROUTE117         (32 | (0 << 8))
-#define MAP_ROUTE118         (33 | (0 << 8))
-#define MAP_ROUTE119         (34 | (0 << 8))
-#define MAP_ROUTE120         (35 | (0 << 8))
-#define MAP_ROUTE121         (36 | (0 << 8))
-#define MAP_ROUTE122         (37 | (0 << 8))
-#define MAP_ROUTE123         (38 | (0 << 8))
-#define MAP_ROUTE124         (39 | (0 << 8))
-#define MAP_ROUTE125         (40 | (0 << 8))
-#define MAP_ROUTE126         (41 | (0 << 8))
-#define MAP_ROUTE127         (42 | (0 << 8))
-#define MAP_ROUTE128         (43 | (0 << 8))
-#define MAP_ROUTE129         (44 | (0 << 8))
-#define MAP_ROUTE130         (45 | (0 << 8))
-#define MAP_ROUTE131         (46 | (0 << 8))
-#define MAP_ROUTE132         (47 | (0 << 8))
-#define MAP_ROUTE133         (48 | (0 << 8))
-#define MAP_ROUTE134         (49 | (0 << 8))
-#define MAP_UNDERWATER1      (50 | (0 << 8))
-#define MAP_UNDERWATER2      (51 | (0 << 8))
-#define MAP_UNDERWATER3      (52 | (0 << 8))
-#define MAP_UNDERWATER4      (53 | (0 << 8))
-#define MAP_UNDERWATER5      (54 | (0 << 8))
-#define MAP_UNDERWATER6      (55 | (0 << 8))
-#define MAP_UNDERWATER7      (56 | (0 << 8))
+#define MAP_PETALBURG_CITY      (0 | (0 << 8))
+#define MAP_SLATEPORT_CITY      (1 | (0 << 8))
+#define MAP_MAUVILLE_CITY       (2 | (0 << 8))
+#define MAP_RUSTBORO_CITY       (3 | (0 << 8))
+#define MAP_FORTREE_CITY        (4 | (0 << 8))
+#define MAP_LILYCOVE_CITY       (5 | (0 << 8))
+#define MAP_MOSSDEEP_CITY       (6 | (0 << 8))
+#define MAP_SOOTOPOLIS_CITY     (7 | (0 << 8))
+#define MAP_EVER_GRANDE_CITY    (8 | (0 << 8))
+#define MAP_LITTLEROOT_TOWN     (9 | (0 << 8))
+#define MAP_OLDALE_TOWN         (10 | (0 << 8))
+#define MAP_DEWFORD_TOWN        (11 | (0 << 8))
+#define MAP_LAVARIDGE_TOWN      (12 | (0 << 8))
+#define MAP_FALLARBOR_TOWN      (13 | (0 << 8))
+#define MAP_VERDANTURF_TOWN     (14 | (0 << 8))
+#define MAP_PACIFIDLOG_TOWN     (15 | (0 << 8))
+#define MAP_ROUTE101            (16 | (0 << 8))
+#define MAP_ROUTE102            (17 | (0 << 8))
+#define MAP_ROUTE103            (18 | (0 << 8))
+#define MAP_ROUTE104            (19 | (0 << 8))
+#define MAP_ROUTE105            (20 | (0 << 8))
+#define MAP_ROUTE106            (21 | (0 << 8))
+#define MAP_ROUTE107            (22 | (0 << 8))
+#define MAP_ROUTE108            (23 | (0 << 8))
+#define MAP_ROUTE109            (24 | (0 << 8))
+#define MAP_ROUTE110            (25 | (0 << 8))
+#define MAP_ROUTE111            (26 | (0 << 8))
+#define MAP_ROUTE112            (27 | (0 << 8))
+#define MAP_ROUTE113            (28 | (0 << 8))
+#define MAP_ROUTE114            (29 | (0 << 8))
+#define MAP_ROUTE115            (30 | (0 << 8))
+#define MAP_ROUTE116            (31 | (0 << 8))
+#define MAP_ROUTE117            (32 | (0 << 8))
+#define MAP_ROUTE118            (33 | (0 << 8))
+#define MAP_ROUTE119            (34 | (0 << 8))
+#define MAP_ROUTE120            (35 | (0 << 8))
+#define MAP_ROUTE121            (36 | (0 << 8))
+#define MAP_ROUTE122            (37 | (0 << 8))
+#define MAP_ROUTE123            (38 | (0 << 8))
+#define MAP_ROUTE124            (39 | (0 << 8))
+#define MAP_ROUTE125            (40 | (0 << 8))
+#define MAP_ROUTE126            (41 | (0 << 8))
+#define MAP_ROUTE127            (42 | (0 << 8))
+#define MAP_ROUTE128            (43 | (0 << 8))
+#define MAP_ROUTE129            (44 | (0 << 8))
+#define MAP_ROUTE130            (45 | (0 << 8))
+#define MAP_ROUTE131            (46 | (0 << 8))
+#define MAP_ROUTE132            (47 | (0 << 8))
+#define MAP_ROUTE133            (48 | (0 << 8))
+#define MAP_ROUTE134            (49 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
+#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
 
 // Map Group 1
 #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 52eabe71b..bac914fec 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -239,12 +239,12 @@
 #define UNOWN_FORM_COUNT 28
 
 // Battle move flags
-#define FLAG_MAKES_CONTACT          0x1
-#define FLAG_PROTECT_AFFECTED       0x2
-#define FLAG_MAGICCOAT_AFFECTED     0x4
-#define FLAG_SNATCH_AFFECTED        0x8
-#define FLAG_MIRROR_MOVE_AFFECTED   0x10
-#define FLAG_KINGSROCK_AFFECTED     0x20
+#define FLAG_MAKES_CONTACT          (1 << 0)
+#define FLAG_PROTECT_AFFECTED       (1 << 1)
+#define FLAG_MAGIC_COAT_AFFECTED    (1 << 2)
+#define FLAG_SNATCH_AFFECTED        (1 << 3)
+#define FLAG_MIRROR_MOVE_AFFECTED   (1 << 4)
+#define FLAG_KINGS_ROCK_AFFECTED    (1 << 5)
 
 // Growth rates
 #define GROWTH_MEDIUM_FAST  0
@@ -268,22 +268,22 @@
 
 #define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80
 
-// Evolution type flags
-#define EVO_FRIENDSHIP       0x0001 // Pokémon levels up with friendship ≥ 220
-#define EVO_FRIENDSHIP_DAY   0x0002 // Pokémon levels up during the day with friendship ≥ 220
-#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220
-#define EVO_LEVEL            0x0004 // Pokémon reaches the specified level
-#define EVO_TRADE            0x0005 // Pokémon is traded
-#define EVO_TRADE_ITEM       0x0006 // Pokémon is traded while it's holding the specified item
-#define EVO_ITEM             0x0007 // specified item is used on Pokémon
-#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense
-#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense
-#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense
-#define EVO_LEVEL_SILCOON    0x000b // Pokémon reaches the specified level with a Silcoon personality value
-#define EVO_LEVEL_CASCOON    0x000c // Pokémon reaches the specified level with a Cascoon personality value
-#define EVO_LEVEL_NINJASK    0x000d // Pokémon reaches the specified level (special value for Ninjask)
-#define EVO_LEVEL_SHEDINJA   0x000e // Pokémon reaches the specified level (special value for Shedinja)
-#define EVO_BEAUTY           0x000f // Pokémon levels up with beauty ≥ specified value
+// Evolution types
+#define EVO_FRIENDSHIP       1  // Pokémon levels up with friendship ≥ 220
+#define EVO_FRIENDSHIP_DAY   2  // Pokémon levels up during the day with friendship ≥ 220
+#define EVO_FRIENDSHIP_NIGHT 3  // Pokémon levels up at night with friendship ≥ 220
+#define EVO_LEVEL            4  // Pokémon reaches the specified level
+#define EVO_TRADE            5  // Pokémon is traded
+#define EVO_TRADE_ITEM       6  // Pokémon is traded while it's holding the specified item
+#define EVO_ITEM             7  // specified item is used on Pokémon
+#define EVO_LEVEL_ATK_GT_DEF 8  // Pokémon reaches the specified level with attack > defense
+#define EVO_LEVEL_ATK_EQ_DEF 9  // Pokémon reaches the specified level with attack = defense
+#define EVO_LEVEL_ATK_LT_DEF 10 // Pokémon reaches the specified level with attack < defense
+#define EVO_LEVEL_SILCOON    11 // Pokémon reaches the specified level with a Silcoon personality value
+#define EVO_LEVEL_CASCOON    12 // Pokémon reaches the specified level with a Cascoon personality value
+#define EVO_LEVEL_NINJASK    13 // Pokémon reaches the specified level (special value for Ninjask)
+#define EVO_LEVEL_SHEDINJA   14 // Pokémon reaches the specified level (special value for Shedinja)
+#define EVO_BEAUTY           15 // Pokémon levels up with beauty ≥ specified value
 
 #define EVOS_PER_MON 5
 
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 5e64048dd..65aa3e1ca 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -52,9 +52,9 @@
 #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_126               0x33
+#define MAPSEC_UNDERWATER_127               0x34
+#define MAPSEC_UNDERWATER_128               0x35
 #define MAPSEC_UNDERWATER_SOOTOPOLIS        0x36
 #define MAPSEC_GRANITE_CAVE                 0x37
 #define MAPSEC_MT_CHIMNEY                   0x38
@@ -70,7 +70,7 @@
 #define MAPSEC_AQUA_HIDEOUT_OLD             0x42
 #define MAPSEC_SHOAL_CAVE                   0x43
 #define MAPSEC_SEAFLOOR_CAVERN              0x44
-#define MAPSEC_UNDERWATER_128               0x45
+#define MAPSEC_UNDERWATER_SEAFLOOR_CAVERN   0x45
 #define MAPSEC_VICTORY_ROAD                 0x46
 #define MAPSEC_MIRAGE_ISLAND                0x47
 #define MAPSEC_CAVE_OF_ORIGIN               0x48
@@ -207,8 +207,8 @@
 #define MAPSEC_MARINE_CAVE                  0xCB
 #define MAPSEC_UNDERWATER_MARINE_CAVE       0xCC
 #define MAPSEC_TERRA_CAVE                   0xCD
-#define MAPSEC_UNDERWATER_TERRA_CAVE        0xCE
-#define MAPSEC_UNDERWATER_UNK1              0xCF
+#define MAPSEC_UNDERWATER_105               0xCE
+#define MAPSEC_UNDERWATER_125               0xCF
 #define MAPSEC_UNDERWATER_129               0xD0
 #define MAPSEC_DESERT_UNDERPASS             0xD1
 #define MAPSEC_ALTERING_CAVE                0xD2
diff --git a/include/constants/rgb.h b/include/constants/rgb.h
index 80d951f4b..1896250d2 100644
--- a/include/constants/rgb.h
+++ b/include/constants/rgb.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_RGB_H
 #define GUARD_RGB_H
 
+#define GET_R(color) ((color) & 0x1F)
+#define GET_G(color) (((color) >> 5) & 0x1F)
+#define GET_B(color) (((color) >> 10) & 0x1F)
+
 #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
 #define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
 #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
diff --git a/include/constants/species.h b/include/constants/species.h
index 8fa5cf77b..983e1a796 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -417,36 +417,36 @@
 #define SPECIES_CHIMECHO 411
 #define SPECIES_EGG 412
 
-#define SPECIES_UNOWN_B 413
-#define SPECIES_UNOWN_C 414
-#define SPECIES_UNOWN_D 415
-#define SPECIES_UNOWN_E 416
-#define SPECIES_UNOWN_F 417
-#define SPECIES_UNOWN_G 418
-#define SPECIES_UNOWN_H 419
-#define SPECIES_UNOWN_I 420
-#define SPECIES_UNOWN_J 421
-#define SPECIES_UNOWN_K 422
-#define SPECIES_UNOWN_L 423
-#define SPECIES_UNOWN_M 424
-#define SPECIES_UNOWN_N 425
-#define SPECIES_UNOWN_O 426
-#define SPECIES_UNOWN_P 427
-#define SPECIES_UNOWN_Q 428
-#define SPECIES_UNOWN_R 429
-#define SPECIES_UNOWN_S 430
-#define SPECIES_UNOWN_T 431
-#define SPECIES_UNOWN_U 432
-#define SPECIES_UNOWN_V 433
-#define SPECIES_UNOWN_W 434
-#define SPECIES_UNOWN_X 435
-#define SPECIES_UNOWN_Y 436
-#define SPECIES_UNOWN_Z 437
-#define SPECIES_UNOWN_EMARK 438
-#define SPECIES_UNOWN_QMARK 439
-
 #define NUM_SPECIES SPECIES_EGG
 
+#define SPECIES_UNOWN_B (NUM_SPECIES + 1)
+#define SPECIES_UNOWN_C (SPECIES_UNOWN_B + 1)
+#define SPECIES_UNOWN_D (SPECIES_UNOWN_B + 2)
+#define SPECIES_UNOWN_E (SPECIES_UNOWN_B + 3)
+#define SPECIES_UNOWN_F (SPECIES_UNOWN_B + 4)
+#define SPECIES_UNOWN_G (SPECIES_UNOWN_B + 5)
+#define SPECIES_UNOWN_H (SPECIES_UNOWN_B + 6)
+#define SPECIES_UNOWN_I (SPECIES_UNOWN_B + 7)
+#define SPECIES_UNOWN_J (SPECIES_UNOWN_B + 8)
+#define SPECIES_UNOWN_K (SPECIES_UNOWN_B + 9)
+#define SPECIES_UNOWN_L (SPECIES_UNOWN_B + 10)
+#define SPECIES_UNOWN_M (SPECIES_UNOWN_B + 11)
+#define SPECIES_UNOWN_N (SPECIES_UNOWN_B + 12)
+#define SPECIES_UNOWN_O (SPECIES_UNOWN_B + 13)
+#define SPECIES_UNOWN_P (SPECIES_UNOWN_B + 14)
+#define SPECIES_UNOWN_Q (SPECIES_UNOWN_B + 15)
+#define SPECIES_UNOWN_R (SPECIES_UNOWN_B + 16)
+#define SPECIES_UNOWN_S (SPECIES_UNOWN_B + 17)
+#define SPECIES_UNOWN_T (SPECIES_UNOWN_B + 18)
+#define SPECIES_UNOWN_U (SPECIES_UNOWN_B + 19)
+#define SPECIES_UNOWN_V (SPECIES_UNOWN_B + 20)
+#define SPECIES_UNOWN_W (SPECIES_UNOWN_B + 21)
+#define SPECIES_UNOWN_X (SPECIES_UNOWN_B + 22)
+#define SPECIES_UNOWN_Y (SPECIES_UNOWN_B + 23)
+#define SPECIES_UNOWN_Z (SPECIES_UNOWN_B + 24)
+#define SPECIES_UNOWN_EMARK (SPECIES_UNOWN_B + 25)
+#define SPECIES_UNOWN_QMARK (SPECIES_UNOWN_B + 26)
+
 // National Dex Index Defines
 
 #define NATIONAL_DEX_NONE           0
@@ -845,31 +845,31 @@
 
 #define NATIONAL_DEX_COUNT          NATIONAL_DEX_DEOXYS
 
-#define NATIONAL_DEX_OLD_UNOWN_B    387
-#define NATIONAL_DEX_OLD_UNOWN_C    388
-#define NATIONAL_DEX_OLD_UNOWN_D    389
-#define NATIONAL_DEX_OLD_UNOWN_E    390
-#define NATIONAL_DEX_OLD_UNOWN_F    391
-#define NATIONAL_DEX_OLD_UNOWN_G    392
-#define NATIONAL_DEX_OLD_UNOWN_H    393
-#define NATIONAL_DEX_OLD_UNOWN_I    394
-#define NATIONAL_DEX_OLD_UNOWN_J    395
-#define NATIONAL_DEX_OLD_UNOWN_K    396
-#define NATIONAL_DEX_OLD_UNOWN_L    397
-#define NATIONAL_DEX_OLD_UNOWN_M    398
-#define NATIONAL_DEX_OLD_UNOWN_N    399
-#define NATIONAL_DEX_OLD_UNOWN_O    400
-#define NATIONAL_DEX_OLD_UNOWN_P    401
-#define NATIONAL_DEX_OLD_UNOWN_Q    402
-#define NATIONAL_DEX_OLD_UNOWN_R    403
-#define NATIONAL_DEX_OLD_UNOWN_S    404
-#define NATIONAL_DEX_OLD_UNOWN_T    405
-#define NATIONAL_DEX_OLD_UNOWN_U    406
-#define NATIONAL_DEX_OLD_UNOWN_V    407
-#define NATIONAL_DEX_OLD_UNOWN_W    408
-#define NATIONAL_DEX_OLD_UNOWN_X    409
-#define NATIONAL_DEX_OLD_UNOWN_Y    410
-#define NATIONAL_DEX_OLD_UNOWN_Z    411
+#define NATIONAL_DEX_OLD_UNOWN_B    (NATIONAL_DEX_COUNT + 1)
+#define NATIONAL_DEX_OLD_UNOWN_C    (NATIONAL_DEX_OLD_UNOWN_B + 1)
+#define NATIONAL_DEX_OLD_UNOWN_D    (NATIONAL_DEX_OLD_UNOWN_B + 2)
+#define NATIONAL_DEX_OLD_UNOWN_E    (NATIONAL_DEX_OLD_UNOWN_B + 3)
+#define NATIONAL_DEX_OLD_UNOWN_F    (NATIONAL_DEX_OLD_UNOWN_B + 4)
+#define NATIONAL_DEX_OLD_UNOWN_G    (NATIONAL_DEX_OLD_UNOWN_B + 5)
+#define NATIONAL_DEX_OLD_UNOWN_H    (NATIONAL_DEX_OLD_UNOWN_B + 6)
+#define NATIONAL_DEX_OLD_UNOWN_I    (NATIONAL_DEX_OLD_UNOWN_B + 7)
+#define NATIONAL_DEX_OLD_UNOWN_J    (NATIONAL_DEX_OLD_UNOWN_B + 8)
+#define NATIONAL_DEX_OLD_UNOWN_K    (NATIONAL_DEX_OLD_UNOWN_B + 9)
+#define NATIONAL_DEX_OLD_UNOWN_L    (NATIONAL_DEX_OLD_UNOWN_B + 10)
+#define NATIONAL_DEX_OLD_UNOWN_M    (NATIONAL_DEX_OLD_UNOWN_B + 11)
+#define NATIONAL_DEX_OLD_UNOWN_N    (NATIONAL_DEX_OLD_UNOWN_B + 12)
+#define NATIONAL_DEX_OLD_UNOWN_O    (NATIONAL_DEX_OLD_UNOWN_B + 13)
+#define NATIONAL_DEX_OLD_UNOWN_P    (NATIONAL_DEX_OLD_UNOWN_B + 14)
+#define NATIONAL_DEX_OLD_UNOWN_Q    (NATIONAL_DEX_OLD_UNOWN_B + 15)
+#define NATIONAL_DEX_OLD_UNOWN_R    (NATIONAL_DEX_OLD_UNOWN_B + 16)
+#define NATIONAL_DEX_OLD_UNOWN_S    (NATIONAL_DEX_OLD_UNOWN_B + 17)
+#define NATIONAL_DEX_OLD_UNOWN_T    (NATIONAL_DEX_OLD_UNOWN_B + 18)
+#define NATIONAL_DEX_OLD_UNOWN_U    (NATIONAL_DEX_OLD_UNOWN_B + 19)
+#define NATIONAL_DEX_OLD_UNOWN_V    (NATIONAL_DEX_OLD_UNOWN_B + 20)
+#define NATIONAL_DEX_OLD_UNOWN_W    (NATIONAL_DEX_OLD_UNOWN_B + 21)
+#define NATIONAL_DEX_OLD_UNOWN_X    (NATIONAL_DEX_OLD_UNOWN_B + 22)
+#define NATIONAL_DEX_OLD_UNOWN_Y    (NATIONAL_DEX_OLD_UNOWN_B + 23)
+#define NATIONAL_DEX_OLD_UNOWN_Z    (NATIONAL_DEX_OLD_UNOWN_B + 24)
 
 // Hoenn Dex Index Defines
 
@@ -1264,30 +1264,30 @@
 #define HOENN_DEX_HO_OH         385
 #define HOENN_DEX_CELEBI        386
 
-#define HOENN_DEX_OLD_UNOWN_B   387
-#define HOENN_DEX_OLD_UNOWN_C   388
-#define HOENN_DEX_OLD_UNOWN_D   389
-#define HOENN_DEX_OLD_UNOWN_E   390
-#define HOENN_DEX_OLD_UNOWN_F   391
-#define HOENN_DEX_OLD_UNOWN_G   392
-#define HOENN_DEX_OLD_UNOWN_H   393
-#define HOENN_DEX_OLD_UNOWN_I   394
-#define HOENN_DEX_OLD_UNOWN_J   395
-#define HOENN_DEX_OLD_UNOWN_K   396
-#define HOENN_DEX_OLD_UNOWN_L   397
-#define HOENN_DEX_OLD_UNOWN_M   398
-#define HOENN_DEX_OLD_UNOWN_N   399
-#define HOENN_DEX_OLD_UNOWN_O   400
-#define HOENN_DEX_OLD_UNOWN_P   401
-#define HOENN_DEX_OLD_UNOWN_Q   402
-#define HOENN_DEX_OLD_UNOWN_R   403
-#define HOENN_DEX_OLD_UNOWN_S   404
-#define HOENN_DEX_OLD_UNOWN_T   405
-#define HOENN_DEX_OLD_UNOWN_U   406
-#define HOENN_DEX_OLD_UNOWN_V   407
-#define HOENN_DEX_OLD_UNOWN_W   408
-#define HOENN_DEX_OLD_UNOWN_X   409
-#define HOENN_DEX_OLD_UNOWN_Y   410
-#define HOENN_DEX_OLD_UNOWN_Z   411
+#define HOENN_DEX_OLD_UNOWN_B   (HOENN_DEX_CELEBI + 1)
+#define HOENN_DEX_OLD_UNOWN_C   (HOENN_DEX_OLD_UNOWN_B + 1)
+#define HOENN_DEX_OLD_UNOWN_D   (HOENN_DEX_OLD_UNOWN_B + 2)
+#define HOENN_DEX_OLD_UNOWN_E   (HOENN_DEX_OLD_UNOWN_B + 3)
+#define HOENN_DEX_OLD_UNOWN_F   (HOENN_DEX_OLD_UNOWN_B + 4)
+#define HOENN_DEX_OLD_UNOWN_G   (HOENN_DEX_OLD_UNOWN_B + 5)
+#define HOENN_DEX_OLD_UNOWN_H   (HOENN_DEX_OLD_UNOWN_B + 6)
+#define HOENN_DEX_OLD_UNOWN_I   (HOENN_DEX_OLD_UNOWN_B + 7)
+#define HOENN_DEX_OLD_UNOWN_J   (HOENN_DEX_OLD_UNOWN_B + 8)
+#define HOENN_DEX_OLD_UNOWN_K   (HOENN_DEX_OLD_UNOWN_B + 9)
+#define HOENN_DEX_OLD_UNOWN_L   (HOENN_DEX_OLD_UNOWN_B + 10)
+#define HOENN_DEX_OLD_UNOWN_M   (HOENN_DEX_OLD_UNOWN_B + 11)
+#define HOENN_DEX_OLD_UNOWN_N   (HOENN_DEX_OLD_UNOWN_B + 12)
+#define HOENN_DEX_OLD_UNOWN_O   (HOENN_DEX_OLD_UNOWN_B + 13)
+#define HOENN_DEX_OLD_UNOWN_P   (HOENN_DEX_OLD_UNOWN_B + 14)
+#define HOENN_DEX_OLD_UNOWN_Q   (HOENN_DEX_OLD_UNOWN_B + 15)
+#define HOENN_DEX_OLD_UNOWN_R   (HOENN_DEX_OLD_UNOWN_B + 16)
+#define HOENN_DEX_OLD_UNOWN_S   (HOENN_DEX_OLD_UNOWN_B + 17)
+#define HOENN_DEX_OLD_UNOWN_T   (HOENN_DEX_OLD_UNOWN_B + 18)
+#define HOENN_DEX_OLD_UNOWN_U   (HOENN_DEX_OLD_UNOWN_B + 19)
+#define HOENN_DEX_OLD_UNOWN_V   (HOENN_DEX_OLD_UNOWN_B + 20)
+#define HOENN_DEX_OLD_UNOWN_W   (HOENN_DEX_OLD_UNOWN_B + 21)
+#define HOENN_DEX_OLD_UNOWN_X   (HOENN_DEX_OLD_UNOWN_B + 22)
+#define HOENN_DEX_OLD_UNOWN_Y   (HOENN_DEX_OLD_UNOWN_B + 23)
+#define HOENN_DEX_OLD_UNOWN_Z   (HOENN_DEX_OLD_UNOWN_B + 24)
 
 #endif  // GUARD_CONSTANTS_SPECIES_H