3 files changed, 100 insertions, 57 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index 008d3a117..62c5a2ef2 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -83,6 +83,7 @@
 #define MOVEMENT_TYPE_VS_SEEKER_4E                     0x4E
 #define MOVEMENT_TYPE_VS_SEEKER_4F                     0x4F
 #define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST            0x50
+#define MOVEMENT_TYPES_COUNT                           0x51
 
 #define MOVEMENT_ACTION_FACE_DOWN                       0x0
 #define MOVEMENT_ACTION_FACE_UP                         0x1
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 92795246a..47b5f2bed 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,16 +1,16 @@
 #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H 
 #define GUARD_CONSTANTS_FIELD_EFFECTS_H 
 
-#define FLDEFF_EXCLAMATION_MARK_ICON     0
-#define FLDEFF_USE_CUT_ON_GRASS          1 
-#define FLDEFF_USE_CUT_ON_TREE           2 
-#define FLDEFF_SHADOW                    3 
-#define FLDEFF_TALL_GRASS                4 
-#define FLDEFF_RIPPLE                    5 
-#define FLDEFF_FIELD_MOVE_SHOW_MON       6 
-#define FLDEFF_ASH                       7 
-#define FLDEFF_SURF_BLOB                 8 
-#define FLDEFF_USE_SURF                  9 
+#define FLDEFF_EXCLAMATION_MARK_ICON      0
+#define FLDEFF_USE_CUT_ON_GRASS           1
+#define FLDEFF_USE_CUT_ON_TREE            2
+#define FLDEFF_SHADOW                     3
+#define FLDEFF_TALL_GRASS                 4
+#define FLDEFF_RIPPLE                     5
+#define FLDEFF_FIELD_MOVE_SHOW_MON        6
+#define FLDEFF_ASH                        7
+#define FLDEFF_SURF_BLOB                  8
+#define FLDEFF_USE_SURF                   9
 #define FLDEFF_DUST                      10
 #define FLDEFF_USE_SECRET_POWER_CAVE     11
 #define FLDEFF_JUMP_TALL_GRASS           12
@@ -72,4 +72,46 @@
 #define FLDEFF_DESTROY_DEOXYS_ROCK       68
 #define FLDEFF_UNK_45                    69 // TODO: related to fame checker photos
 
+#define FLDEFF_PAL_TAG_GENERAL_0          0x1004
+#define FLDEFF_PAL_TAG_GENERAL_1          0x1005
+#define FLDEFF_PAL_TAG_ASH                0x100D
+#define FLDEFF_PAL_TAG_SMALL_SPARKLE      0x100F
+
+#define FLDEFFOBJ_SHADOW_S                  0
+#define FLDEFFOBJ_SHADOW_M                  1
+#define FLDEFFOBJ_SHADOW_L                  2
+#define FLDEFFOBJ_SHADOW_XL                 3
+#define FLDEFFOBJ_TALL_GRASS                4
+#define FLDEFFOBJ_RIPPLE                    5
+#define FLDEFFOBJ_ASH                       6
+#define FLDEFFOBJ_SURF_BLOB                 7
+#define FLDEFFOBJ_ARROW                     8
+#define FLDEFFOBJ_GROUND_IMPACT_DUST        9
+#define FLDEFFOBJ_JUMP_TALL_GRASS          10
+#define FLDEFFOBJ_SAND_FOOTPRINTS          11
+#define FLDEFFOBJ_JUMP_BIG_SPLASH          12
+#define FLDEFFOBJ_SPLASH                   13
+#define FLDEFFOBJ_JUMP_SMALL_SPLASH        14
+#define FLDEFFOBJ_LONG_GRASS               15
+#define FLDEFFOBJ_JUMP_LONG_GRASS          16
+#define FLDEFFOBJ_UNUSED_GRASS             17
+#define FLDEFFOBJ_UNUSED_GRASS_2           18
+#define FLDEFFOBJ_UNUSED_SAND              19
+#define FLDEFFOBJ_WATER_SURFACING          20
+#define FLDEFFOBJ_REFLECTION_DISTORTION    21
+#define FLDEFFOBJ_SPARKLE                  22
+#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS     23
+#define FLDEFFOBJ_TREE_DISGUISE            24
+#define FLDEFFOBJ_MOUNTAIN_DISGUISE        25
+#define FLDEFFOBJ_BIRD                     26
+#define FLDEFFOBJ_BIKE_TIRE_TRACKS         27
+#define FLDEFFOBJ_SAND_DISGUISE            28
+#define FLDEFFOBJ_SAND_PILE                29
+#define FLDEFFOBJ_SHORT_GRASS              30
+#define FLDEFFOBJ_HOT_SPRINGS_WATER        31
+#define FLDEFFOBJ_ASH_PUFF                 32
+#define FLDEFFOBJ_ASH_LAUNCH               33
+#define FLDEFFOBJ_BUBBLES                  34
+#define FLDEFFOBJ_SMALL_SPARKLE            35
+
 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 788ea7bda..b22eca15c 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -5,14 +5,14 @@
 // DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json
 //
 
-// Map Group 0
+// gMapGroup_Link
 #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
 #define MAP_TRADE_CENTER        (1 | (0 << 8))
 #define MAP_RECORD_CORNER       (2 | (0 << 8))
 #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
 #define MAP_UNION_ROOM          (4 | (0 << 8))
 
-// Map Group 1
+// gMapGroup_Dungeons
 #define MAP_VIRIDIAN_FOREST                      (0 | (1 << 8))
 #define MAP_MT_MOON_1F                           (1 | (1 << 8))
 #define MAP_MT_MOON_B1F                          (2 | (1 << 8))
@@ -137,7 +137,7 @@
 #define MAP_SIX_ISLAND_PATTERN_BUSH              (121 | (1 << 8))
 #define MAP_SIX_ISLAND_ALTERING_CAVE             (122 | (1 << 8))
 
-// Map Group 2
+// gMapGroup_SpecialArea
 #define MAP_NAVEL_ROCK_EXTERIOR                       (0 | (2 << 8))
 #define MAP_TRAINER_TOWER_1F                          (1 | (2 << 8))
 #define MAP_TRAINER_TOWER_2F                          (2 | (2 << 8))
@@ -199,7 +199,7 @@
 #define MAP_BIRTH_ISLAND_HARBOR                       (58 | (2 << 8))
 #define MAP_NAVEL_ROCK_HARBOR                         (59 | (2 << 8))
 
-// Map Group 3
+// gMapGroup_TownsAndRoutes
 #define MAP_PALLET_TOWN                          (0 | (3 << 8))
 #define MAP_VIRIDIAN_CITY                        (1 | (3 << 8))
 #define MAP_PEWTER_CITY                          (2 | (3 << 8))
@@ -267,13 +267,13 @@
 #define MAP_SEVEN_ISLAND_SEVAULT_CANYON          (64 | (3 << 8))
 #define MAP_SEVEN_ISLAND_TANOBY_RUINS            (65 | (3 << 8))
 
-// Map Group 4
+// gMapGroup_IndoorPallet
 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F   (0 | (4 << 8))
 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F   (1 | (4 << 8))
 #define MAP_PALLET_TOWN_RIVALS_HOUSE       (2 | (4 << 8))
 #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8))
 
-// Map Group 5
+// gMapGroup_IndoorViridian
 #define MAP_VIRIDIAN_CITY_HOUSE1            (0 | (5 << 8))
 #define MAP_VIRIDIAN_CITY_GYM               (1 | (5 << 8))
 #define MAP_VIRIDIAN_CITY_HOUSE2            (2 | (5 << 8))
@@ -281,7 +281,7 @@
 #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8))
 #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8))
 
-// Map Group 6
+// gMapGroup_IndoorPewter
 #define MAP_PEWTER_CITY_MUSEUM_1F         (0 | (6 << 8))
 #define MAP_PEWTER_CITY_MUSEUM_2F         (1 | (6 << 8))
 #define MAP_PEWTER_CITY_GYM               (2 | (6 << 8))
@@ -291,7 +291,7 @@
 #define MAP_PEWTER_CITY_POKEMON_CENTER_2F (6 | (6 << 8))
 #define MAP_PEWTER_CITY_HOUSE2            (7 | (6 << 8))
 
-// Map Group 7
+// gMapGroup_IndoorCerulean
 #define MAP_CERULEAN_CITY_HOUSE1            (0 | (7 << 8))
 #define MAP_CERULEAN_CITY_HOUSE2            (1 | (7 << 8))
 #define MAP_CERULEAN_CITY_HOUSE3            (2 | (7 << 8))
@@ -303,7 +303,7 @@
 #define MAP_CERULEAN_CITY_HOUSE4            (8 | (7 << 8))
 #define MAP_CERULEAN_CITY_HOUSE5            (9 | (7 << 8))
 
-// Map Group 8
+// gMapGroup_IndoorLavender
 #define MAP_LAVENDER_TOWN_POKEMON_CENTER_1F       (0 | (8 << 8))
 #define MAP_LAVENDER_TOWN_POKEMON_CENTER_2F       (1 | (8 << 8))
 #define MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE (2 | (8 << 8))
@@ -311,7 +311,7 @@
 #define MAP_LAVENDER_TOWN_HOUSE2                  (4 | (8 << 8))
 #define MAP_LAVENDER_TOWN_MART                    (5 | (8 << 8))
 
-// Map Group 9
+// gMapGroup_IndoorVermilion
 #define MAP_VERMILION_CITY_HOUSE1            (0 | (9 << 8))
 #define MAP_VERMILION_CITY_POKEMON_CENTER_1F (1 | (9 << 8))
 #define MAP_VERMILION_CITY_POKEMON_CENTER_2F (2 | (9 << 8))
@@ -321,7 +321,7 @@
 #define MAP_VERMILION_CITY_GYM               (6 | (9 << 8))
 #define MAP_VERMILION_CITY_HOUSE3            (7 | (9 << 8))
 
-// Map Group 10
+// gMapGroup_IndoorCeladon
 #define MAP_CELADON_CITY_DEPARTMENT_STORE_1F       (0 | (10 << 8))
 #define MAP_CELADON_CITY_DEPARTMENT_STORE_2F       (1 | (10 << 8))
 #define MAP_CELADON_CITY_DEPARTMENT_STORE_3F       (2 | (10 << 8))
@@ -343,7 +343,7 @@
 #define MAP_CELADON_CITY_HOUSE1                    (18 | (10 << 8))
 #define MAP_CELADON_CITY_HOTEL                     (19 | (10 << 8))
 
-// Map Group 11
+// gMapGroup_IndoorFuchsia
 #define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8))
 #define MAP_FUCHSIA_CITY_MART                 (1 | (11 << 8))
 #define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE   (2 | (11 << 8))
@@ -355,7 +355,7 @@
 #define MAP_FUCHSIA_CITY_HOUSE2               (8 | (11 << 8))
 #define MAP_FUCHSIA_CITY_HOUSE3               (9 | (11 << 8))
 
-// Map Group 12
+// gMapGroup_IndoorCinnabar
 #define MAP_CINNABAR_ISLAND_GYM                         (0 | (12 << 8))
 #define MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE        (1 | (12 << 8))
 #define MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE          (2 | (12 << 8))
@@ -365,11 +365,11 @@
 #define MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F           (6 | (12 << 8))
 #define MAP_CINNABAR_ISLAND_MART                        (7 | (12 << 8))
 
-// Map Group 13
+// gMapGroup_IndoorIndigoPlateau
 #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F (0 | (13 << 8))
 #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8))
 
-// Map Group 14
+// gMapGroup_IndoorSaffron
 #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F        (0 | (14 << 8))
 #define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F        (1 | (14 << 8))
 #define MAP_SAFFRON_CITY_DOJO                     (2 | (14 << 8))
@@ -381,92 +381,92 @@
 #define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE        (8 | (14 << 8))
 #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8))
 
-// Map Group 15
+// gMapGroup_IndoorRoute2
 #define MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE (0 | (15 << 8))
 #define MAP_ROUTE2_HOUSE                          (1 | (15 << 8))
 #define MAP_ROUTE2_EAST_BUILDING                  (2 | (15 << 8))
 #define MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE (3 | (15 << 8))
 
-// Map Group 16
+// gMapGroup_IndoorRoute4
 #define MAP_ROUTE4_POKEMON_CENTER_1F (0 | (16 << 8))
 #define MAP_ROUTE4_POKEMON_CENTER_2F (1 | (16 << 8))
 
-// Map Group 17
+// gMapGroup_IndoorRoute5
 #define MAP_ROUTE5_POKEMON_DAY_CARE (0 | (17 << 8))
 #define MAP_ROUTE5_SOUTH_ENTRANCE   (1 | (17 << 8))
 
-// Map Group 18
+// gMapGroup_IndoorRoute6
 #define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8))
-#define MAP_UNKNOWN_MAP_18_01     (1 | (18 << 8))
+#define MAP_ROUTE6_UNUSED_HOUSE   (1 | (18 << 8))
 
-// Map Group 19
+// gMapGroup_IndoorRoute7
 #define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8))
 
-// Map Group 20
+// gMapGroup_IndoorRoute8
 #define MAP_ROUTE8_WEST_ENTRANCE (0 | (20 << 8))
 
-// Map Group 21
+// gMapGroup_IndoorRoute10
 #define MAP_ROUTE10_POKEMON_CENTER_1F (0 | (21 << 8))
 #define MAP_ROUTE10_POKEMON_CENTER_2F (1 | (21 << 8))
 
-// Map Group 22
+// gMapGroup_IndoorRoute11
 #define MAP_ROUTE11_EAST_ENTRANCE_1F (0 | (22 << 8))
 #define MAP_ROUTE11_EAST_ENTRANCE_2F (1 | (22 << 8))
 
-// Map Group 23
+// gMapGroup_IndoorRoute12
 #define MAP_ROUTE12_NORTH_ENTRANCE_1F (0 | (23 << 8))
 #define MAP_ROUTE12_NORTH_ENTRANCE_2F (1 | (23 << 8))
 #define MAP_ROUTE12_FISHING_HOUSE     (2 | (23 << 8))
 
-// Map Group 24
+// gMapGroup_IndoorRoute15
 #define MAP_ROUTE15_WEST_ENTRANCE_1F (0 | (24 << 8))
 #define MAP_ROUTE15_WEST_ENTRANCE_2F (1 | (24 << 8))
 
-// Map Group 25
+// gMapGroup_IndoorRoute16
 #define MAP_ROUTE16_HOUSE             (0 | (25 << 8))
 #define MAP_ROUTE16_NORTH_ENTRANCE_1F (1 | (25 << 8))
 #define MAP_ROUTE16_NORTH_ENTRANCE_2F (2 | (25 << 8))
 
-// Map Group 26
+// gMapGroup_IndoorRoute18
 #define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8))
 #define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8))
 
-// Map Group 27
-#define MAP_UNUSED_HOUSE_27_00 (0 | (27 << 8))
+// gMapGroup_IndoorRoute19
+#define MAP_ROUTE19_UNUSED_HOUSE (0 | (27 << 8))
 
-// Map Group 28
+// gMapGroup_IndoorRoute22
 #define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8))
 
-// Map Group 29
-#define MAP_UNUSED_HOUSE_29_00 (0 | (29 << 8))
+// gMapGroup_IndoorRoute23
+#define MAP_ROUTE23_UNUSED_HOUSE (0 | (29 << 8))
 
-// Map Group 30
+// gMapGroup_IndoorRoute25
 #define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8))
 
-// Map Group 31
+// gMapGroup_IndoorSevenIsland
 #define MAP_SEVEN_ISLAND_HOUSE_ROOM1       (0 | (31 << 8))
 #define MAP_SEVEN_ISLAND_HOUSE_ROOM2       (1 | (31 << 8))
 #define MAP_SEVEN_ISLAND_MART              (2 | (31 << 8))
 #define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8))
 #define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8))
-#define MAP_UNUSED_HOUSE_31_05             (5 | (31 << 8))
+#define MAP_SEVEN_ISLAND_UNUSED_HOUSE      (5 | (31 << 8))
 #define MAP_SEVEN_ISLAND_HARBOR            (6 | (31 << 8))
 
-// Map Group 32
+// gMapGroup_IndoorOneIsland
 #define MAP_ONE_ISLAND_POKEMON_CENTER_1F (0 | (32 << 8))
 #define MAP_ONE_ISLAND_POKEMON_CENTER_2F (1 | (32 << 8))
 #define MAP_ONE_ISLAND_HOUSE1            (2 | (32 << 8))
 #define MAP_ONE_ISLAND_HOUSE2            (3 | (32 << 8))
 #define MAP_ONE_ISLAND_HARBOR            (4 | (32 << 8))
 
-// Map Group 33
+// gMapGroup_IndoorTwoIsland
 #define MAP_TWO_ISLAND_JOYFUL_GAME_CORNER (0 | (33 << 8))
 #define MAP_TWO_ISLAND_HOUSE              (1 | (33 << 8))
 #define MAP_TWO_ISLAND_POKEMON_CENTER_1F  (2 | (33 << 8))
 #define MAP_TWO_ISLAND_POKEMON_CENTER_2F  (3 | (33 << 8))
 #define MAP_TWO_ISLAND_HARBOR             (4 | (33 << 8))
 
-// Map Group 34
+// gMapGroup_IndoorThreeIsland
 #define MAP_THREE_ISLAND_HOUSE1            (0 | (34 << 8))
 #define MAP_THREE_ISLAND_POKEMON_CENTER_1F (1 | (34 << 8))
 #define MAP_THREE_ISLAND_POKEMON_CENTER_2F (2 | (34 << 8))
@@ -476,7 +476,7 @@
 #define MAP_THREE_ISLAND_HOUSE4            (6 | (34 << 8))
 #define MAP_THREE_ISLAND_HOUSE5            (7 | (34 << 8))
 
-// Map Group 35
+// gMapGroup_IndoorFourIsland
 #define MAP_FOUR_ISLAND_POKEMON_DAY_CARE  (0 | (35 << 8))
 #define MAP_FOUR_ISLAND_POKEMON_CENTER_1F (1 | (35 << 8))
 #define MAP_FOUR_ISLAND_POKEMON_CENTER_2F (2 | (35 << 8))
@@ -486,34 +486,34 @@
 #define MAP_FOUR_ISLAND_HOUSE2            (6 | (35 << 8))
 #define MAP_FOUR_ISLAND_MART              (7 | (35 << 8))
 
-// Map Group 36
+// gMapGroup_IndoorFiveIsland
 #define MAP_FIVE_ISLAND_POKEMON_CENTER_1F (0 | (36 << 8))
 #define MAP_FIVE_ISLAND_POKEMON_CENTER_2F (1 | (36 << 8))
 #define MAP_FIVE_ISLAND_HARBOR            (2 | (36 << 8))
 #define MAP_FIVE_ISLAND_HOUSE1            (3 | (36 << 8))
 #define MAP_FIVE_ISLAND_HOUSE2            (4 | (36 << 8))
 
-// Map Group 37
+// gMapGroup_IndoorSixIsland
 #define MAP_SIX_ISLAND_POKEMON_CENTER_1F (0 | (37 << 8))
 #define MAP_SIX_ISLAND_POKEMON_CENTER_2F (1 | (37 << 8))
 #define MAP_SIX_ISLAND_HARBOR            (2 | (37 << 8))
 #define MAP_SIX_ISLAND_HOUSE             (3 | (37 << 8))
 #define MAP_SIX_ISLAND_MART              (4 | (37 << 8))
 
-// Map Group 38
+// gMapGroup_IndoorThreeIslandRoute
 #define MAP_THREE_ISLAND_HARBOR (0 | (38 << 8))
 
-// Map Group 39
+// gMapGroup_IndoorFiveIslandRoute
 #define MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE (0 | (39 << 8))
 
-// Map Group 40
+// gMapGroup_IndoorTwoIslandRoute
 #define MAP_TWO_ISLAND_CAPE_BRINK_HOUSE (0 | (40 << 8))
 
-// Map Group 41
+// gMapGroup_IndoorSixIslandRoute
 #define MAP_SIX_ISLAND_WATER_PATH_HOUSE1 (0 | (41 << 8))
 #define MAP_SIX_ISLAND_WATER_PATH_HOUSE2 (1 | (41 << 8))
 
-// Map Group 42
+// gMapGroup_IndoorSevenIslandRoute
 #define MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE (0 | (42 << 8))
 
 #define MAP_GROUPS_COUNT 43