dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #244 from GriffinRichards/doc-saffron

Browse Source 
Document Saffron City scripts
This commit is contained in:
PikalaxALT
2020-02-16 11:23:34 -05:00
committed by GitHub
parent 51b7b11a55 ce9f821b4e
commit 4e07002d13
62 changed files with 911 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/flags.h
+1 -1
View File
@@ -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
include/constants/layouts.h
+2 -2
View File
@@ -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
include/constants/map_groups.h
+4 -4
View File
@@ -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