diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-16 11:23:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:23:34 -0500 |
| commit | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (patch) | |
| tree | 483de567be27ed57cc4ffe8851e82444193e892e /include | |
| parent | 51b7b11a55c16c0dfc821b1d6bd536b03f6396e8 (diff) | |
| parent | ce9f821b4e993fd86122476d17870afd0527513a (diff) | |
Merge pull request #244 from GriffinRichards/doc-saffron
Document Saffron City scripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/layouts.h | 4 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 85cd4d850..7555f3c6b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1046,7 +1046,7 @@ #define HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE 23 #define HIDDEN_ITEM_SILPH_CO_5F_ELIXIR 24 #define HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION 25 -#define HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET 26 +#define HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET 26 #define HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR 27 #define HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE 28 #define HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET 29 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 967a4619c..5f9ae3107 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -208,8 +208,8 @@ #define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223 #define LAYOUT_ENTRANCE_1F 224 #define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225 -#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226 -#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227 +#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F 226 +#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F 227 #define LAYOUT_SAFFRON_CITY_DOJO 228 #define LAYOUT_SILPH_CO_ELEVATOR 229 #define LAYOUT_ONE_ISLAND 230 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 1b1b74d37..fe7178dcf 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -366,15 +366,15 @@ #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8)) // Map Group 14 -#define MAP_SAFFRON_CITY_HOUSE1_1F (0 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE1_2F (1 | (14 << 8)) +#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)) #define MAP_SAFFRON_CITY_GYM (3 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE2 (4 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE (4 | (14 << 8)) #define MAP_SAFFRON_CITY_MART (5 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_CENTER_1F (6 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_CENTER_2F (7 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE3 (8 | (14 << 8)) +#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) // Map Group 15 |