Merge pull request #529 from GriffinRichards/rename-viridian

Rename Viridian City houses
This commit is contained in:
GriffinR
2022-08-06 12:53:54 -04:00
committed by GitHub
19 changed files with 181 additions and 181 deletions
+2 -2
View File
@@ -252,7 +252,7 @@
#define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263
#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN 264
#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265
#define LAYOUT_VIRIDIAN_CITY_HOUSE2 266
#define LAYOUT_VIRIDIAN_CITY_SCHOOL 266
#define LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE 267
#define LAYOUT_CELADON_CITY_HOTEL_DUPLICATE 268
#define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269
@@ -262,7 +262,7 @@
#define LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB 273
#define LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE 274
#define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275
#define LAYOUT_VIRIDIAN_CITY_HOUSE1 276
#define LAYOUT_VIRIDIAN_CITY_HOUSE 276
#define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277
#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278
#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279
+2 -2
View File
@@ -274,9 +274,9 @@
#define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8))
// gMapGroup_IndoorViridian
#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8))
#define MAP_VIRIDIAN_CITY_HOUSE (0 | (5 << 8))
#define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8))
#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8))
#define MAP_VIRIDIAN_CITY_SCHOOL (2 | (5 << 8))
#define MAP_VIRIDIAN_CITY_MART (3 | (5 << 8))
#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8))
#define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8))