Merge branch 'master' into doc-cinnabar

7 files changed, 24 insertions, 17 deletions

diff --git a/include/battle.h b/include/battle.h
index bed12204f..c9534745d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -45,7 +45,6 @@
 #define B_ACTION_NONE                      0xFF
 
 #define MAX_TRAINER_ITEMS 4
-#define MAX_MON_MOVES 4
 
 // array entries for battle communication
 #define MULTIUSE_STATE          0x0
diff --git a/include/constants/flags.h b/include/constants/flags.h
index cc65cffa2..26ffa8a7c 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -450,7 +450,7 @@
 #define FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL                   0x1B6
 #define FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE                  0x1B7
 #define FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL                  0x1B8
-#define FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY             0x1B9
+#define FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY         0x1B9
 #define FLAG_HIDE_TWO_ISLAND_REVIVE                             0x1BA
 #define FLAG_HIDE_THREE_ISLAND_ZINC                             0x1BB
 #define FLAG_0x1BC                                              0x1BC
diff --git a/include/constants/global.h b/include/constants/global.h
index 24a61a1e6..77ef6f203 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -60,6 +60,8 @@
 
 #define NUM_BAG_POCKETS 5
 
+#define MAX_MON_MOVES 4
+
 #define PARTY_SIZE 6
 #define MULTI_PARTY_SIZE (PARTY_SIZE / 2)
 
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index a9d40220f..657d531e8 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -180,10 +180,10 @@
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F 195
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F 196
 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF 197
-#define LAYOUT_SAFARI_ZONE_BUILDING 198
+#define LAYOUT_SAFARI_ZONE_REST_HOUSE 198
 #define LAYOUT_SAFARI_ZONE_SECRET_HOUSE 199
-#define LAYOUT_FUCHSIA_CITY_ZOO_BUILDING 200
-#define LAYOUT_FUCHSIA_CITY_BUILDING1 201
+#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE 200
+#define LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE 201
 #define LAYOUT_FUCHSIA_CITY_HOUSE2 202
 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE 203
 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204
@@ -260,8 +260,8 @@
 #define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275
 #define LAYOUT_VIRIDIAN_CITY_HOUSE1 276
 #define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277
-#define LAYOUT_UNUSED_LAYOUT_833B6EC 278
-#define LAYOUT_UNUSED_LAYOUT_833BE30 279
+#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278
+#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279
 #define LAYOUT_MT_EMBER_EXTERIOR 280
 #define LAYOUT_MT_EMBER_SUMMIT 281
 #define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 4d37b0dc8..0cc1c27fb 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -76,10 +76,10 @@
 #define MAP_SAFARI_ZONE_EAST                     (64 | (1 << 8))
 #define MAP_SAFARI_ZONE_NORTH                    (65 | (1 << 8))
 #define MAP_SAFARI_ZONE_WEST                     (66 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING1                (67 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING2                (68 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING3                (69 | (1 << 8))
-#define MAP_SAFARI_ZONE_BUILDING4                (70 | (1 << 8))
+#define MAP_SAFARI_ZONE_CENTER_REST_HOUSE        (67 | (1 << 8))
+#define MAP_SAFARI_ZONE_EAST_REST_HOUSE          (68 | (1 << 8))
+#define MAP_SAFARI_ZONE_NORTH_REST_HOUSE         (69 | (1 << 8))
+#define MAP_SAFARI_ZONE_WEST_REST_HOUSE          (70 | (1 << 8))
 #define MAP_SAFARI_ZONE_SECRET_HOUSE             (71 | (1 << 8))
 #define MAP_CERULEAN_CAVE_1F                     (72 | (1 << 8))
 #define MAP_CERULEAN_CAVE_2F                     (73 | (1 << 8))
@@ -342,12 +342,12 @@
 // Map Group 11
 #define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8))
 #define MAP_FUCHSIA_CITY_MART                 (1 | (11 << 8))
-#define MAP_FUCHSIA_CITY_ZOO_BUILDING         (2 | (11 << 8))
+#define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE   (2 | (11 << 8))
 #define MAP_FUCHSIA_CITY_GYM                  (3 | (11 << 8))
 #define MAP_FUCHSIA_CITY_HOUSE1               (4 | (11 << 8))
 #define MAP_FUCHSIA_CITY_POKEMON_CENTER_1F    (5 | (11 << 8))
 #define MAP_FUCHSIA_CITY_POKEMON_CENTER_2F    (6 | (11 << 8))
-#define MAP_FUCHSIA_CITY_BUILDING1            (7 | (11 << 8))
+#define MAP_FUCHSIA_CITY_WARDENS_HOUSE        (7 | (11 << 8))
 #define MAP_FUCHSIA_CITY_HOUSE2               (8 | (11 << 8))
 #define MAP_FUCHSIA_CITY_HOUSE3               (9 | (11 << 8))
 
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 2d7600696..7cdfb25e5 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -1,6 +1,9 @@
 #ifndef GUARD_METATILE_LABELS_H
 #define GUARD_METATILE_LABELS_H
 
+// General
+#define METATILE_General_CalmWater  0x12B
+
 // Pokemon Mansion
 #define METATILE_PokemonMansion_Floor                                    0x284
 #define METATILE_PokemonMansion_Floor_ShadeFull                          0x285
@@ -44,5 +47,8 @@
 #define METATILE_CinnabarGym_Floor_WallLeftEdge     0x2CF
 #define METATILE_CinnabarGym_Wall_RetractedBarrier  0x2D1
 
+// gTileset_82D504C. Below metatile probably needs generic name
+#define METATILE_MtEmber_CaveEntrance  0x346
+
 
 #endif // GUARD_METATILE_LABELS_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 189985e06..b8da8f3e0 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1148,10 +1148,10 @@ extern const u8 EventScript_FldEffStrength[];
 extern const u8 EventScript_FailSweetScent[];
 extern const u8 EventScript_FldEffRockSmash[];
 
-extern const u8 EventScript_SafariTimesUp[];
-extern const u8 EventScript_SafariRetire[];
-extern const u8 EventScript_SafariWarpOut[];
-extern const u8 EventScript_SafariOutOfBalls[];
+extern const u8 SafariZone_EventScript_TimesUp[];
+extern const u8 SafariZone_EventScript_RetirePrompt[];
+extern const u8 SafariZone_EventScript_OutOfBallsMidBattle[];
+extern const u8 SafariZone_EventScript_OutOfBalls[];
 
 extern const u8 EventScript_ItemfinderDigUpUnderfootItem[];