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

Merge branch 'master' into doc-caves

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:08:43 -05:00
committed by GitHub
parent 30f01c7df6 04130a97d9
commit 533df93dc1
252 changed files with 11583 additions and 12191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/layouts.h
+27 -27
View File
@@ -279,17 +279,17 @@
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F 295
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK 296
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F 300
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F 301
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F 302
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F 303
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F 304
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F 305
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307
#define LAYOUT_TRAINER_TOWER_LOBBY 297
#define LAYOUT_TRAINER_TOWER_1F 298
#define LAYOUT_TRAINER_TOWER_2F 299
#define LAYOUT_TRAINER_TOWER_3F 300
#define LAYOUT_TRAINER_TOWER_4F 301
#define LAYOUT_TRAINER_TOWER_5F 302
#define LAYOUT_TRAINER_TOWER_6F 303
#define LAYOUT_TRAINER_TOWER_7F 304
#define LAYOUT_TRAINER_TOWER_8F 305
#define LAYOUT_TRAINER_TOWER_ROOF 306
#define LAYOUT_TRAINER_TOWER_ELEVATOR 307
#define LAYOUT_CERULEAN_CITY_HOUSE5 308
#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F 309
#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310
@@ -348,22 +348,22 @@
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER 363
#define LAYOUT_NAVEL_ROCK_B1F 364
#define LAYOUT_NAVEL_ROCK_FORK 365
#define LAYOUT_UNUSED_LAYOUT_834BC2C 366
#define LAYOUT_UNUSED_LAYOUT_834BEB4 367
#define LAYOUT_UNUSED_LAYOUT_834C13C 368
#define LAYOUT_UNUSED_LAYOUT_834C3C4 369
#define LAYOUT_UNUSED_LAYOUT_834C64C 370
#define LAYOUT_UNUSED_LAYOUT_834C8D4 371
#define LAYOUT_UNUSED_LAYOUT_834CB5C 372
#define LAYOUT_UNUSED_LAYOUT_834CDE4 373
#define LAYOUT_UNUSED_LAYOUT_834D06C 374
#define LAYOUT_UNUSED_LAYOUT_834D2F4 375
#define LAYOUT_UNUSED_LAYOUT_834D57C 376
#define LAYOUT_UNUSED_LAYOUT_834D804 377
#define LAYOUT_UNUSED_LAYOUT_834DA8C 378
#define LAYOUT_UNUSED_LAYOUT_834DD14 379
#define LAYOUT_UNUSED_LAYOUT_834DF9C 380
#define LAYOUT_UNUSED_LAYOUT_834E224 381
#define LAYOUT_TRAINER_TOWER_1F_DOUBLES 366
#define LAYOUT_TRAINER_TOWER_2F_DOUBLES 367
#define LAYOUT_TRAINER_TOWER_3F_DOUBLES 368
#define LAYOUT_TRAINER_TOWER_4F_DOUBLES 369
#define LAYOUT_TRAINER_TOWER_5F_DOUBLES 370
#define LAYOUT_TRAINER_TOWER_6F_DOUBLES 371
#define LAYOUT_TRAINER_TOWER_7F_DOUBLES 372
#define LAYOUT_TRAINER_TOWER_8F_DOUBLES 373
#define LAYOUT_TRAINER_TOWER_1F_KNOCKOUT 374
#define LAYOUT_TRAINER_TOWER_2F_KNOCKOUT 375
#define LAYOUT_TRAINER_TOWER_3F_KNOCKOUT 376
#define LAYOUT_TRAINER_TOWER_4F_KNOCKOUT 377
#define LAYOUT_TRAINER_TOWER_5F_KNOCKOUT 378
#define LAYOUT_TRAINER_TOWER_6F_KNOCKOUT 379
#define LAYOUT_TRAINER_TOWER_7F_KNOCKOUT 380
#define LAYOUT_TRAINER_TOWER_8F_KNOCKOUT 381
#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1 382
#define LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA 383