diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-18 18:23:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 18:23:00 -0400 |
| commit | 918ed2d31eeeb036230d0912cc2527b83788bc85 (patch) | |
| tree | d4a6e64701f4c79fcb00c20d2efd01a6e43da177 /include | |
| parent | 9392ba8ab1a726e48c0a40321ede325bdb74178c (diff) | |
| parent | c128e68062b0f9ff06be35d8563549fe8144f7d4 (diff) | |
Merge pull request #417 from SatoMew/master
Replace rival labels
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/layouts.h | 2 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h index b64f29809..5218ee717 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -7,7 +7,7 @@ #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2 -#define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3 +#define LAYOUT_PALLET_TOWN_RIVALS_HOUSE 3 #define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4 #define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5 #define LAYOUT_HOUSE1 6 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index a219613aa..788ea7bda 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -270,7 +270,7 @@ // Map Group 4 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8)) #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8)) -#define MAP_PALLET_TOWN_GARYS_HOUSE (2 | (4 << 8)) +#define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8)) #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) // Map Group 5 diff --git a/include/constants/vars.h b/include/constants/vars.h index 468b9566e..70efab478 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -135,7 +135,7 @@ #define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 #define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 #define VAR_MAP_SCENE_VIRIDIAN_CITY_MART 0x4057 -#define VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE 0x4058 +#define VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE 0x4058 #define VAR_MAP_SCENE_POKEMON_TOWER_6F 0x4059 #define VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR 0x405A #define VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR 0x405B |