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

Merge branch 'master' into main_menu

Browse Source
This commit is contained in:
PikalaxALT
2019-10-09 17:59:26 -04:00
parent 20efe34745 77a6ee507f
commit 5e0f0ca6dc
36 changed files with 600 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/flags.h
+1 -1
View File
@@ -17,7 +17,7 @@
#define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897
#define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898
#define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899
#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a
#define FLAG_WORLD_MAP_SAFFRON_CITY 0x89a
#define FLAG_WORLD_MAP_ONE_ISLAND 0x89b
#define FLAG_WORLD_MAP_TWO_ISLAND 0x89c
#define FLAG_WORLD_MAP_THREE_ISLAND 0x89d
include/constants/layouts.h
+2 -2
View File
@@ -71,7 +71,7 @@
#define LAYOUT_FUCHSIA_CITY 85
#define LAYOUT_CINNABAR_ISLAND 86
#define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
#define LAYOUT_SAFFRON_CITY 88
#define LAYOUT_SAFFRON_CITY_CLASSIC 88
#define LAYOUT_ROUTE1 89
#define LAYOUT_ROUTE2 90
#define LAYOUT_ROUTE3 91
@@ -189,7 +189,7 @@
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM 205
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM 206
#define LAYOUT_SAFFRON_CITY_DUPLICATE 207
#define LAYOUT_SAFFRON_CITY 207
#define LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE 208
#define LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE 209
#define LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE 210
include/constants/map_groups.h
+2 -2
View File
@@ -206,8 +206,8 @@
#define MAP_FUCHSIA_CITY (7 | (3 << 8))
#define MAP_CINNABAR_ISLAND (8 | (3 << 8))
#define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8))
#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8))
#define MAP_SAFFRON_CITY (11 | (3 << 8))
#define MAP_SAFFRON_CITY (10 | (3 << 8))
#define MAP_SAFFRON_CITY_CLASSIC (11 | (3 << 8))
#define MAP_ONE_ISLAND (12 | (3 << 8))
#define MAP_TWO_ISLAND (13 | (3 << 8))
#define MAP_THREE_ISLAND (14 | (3 << 8))