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
src/credits.c
+3 -3
View File
@@ -130,7 +130,7 @@ enum CreditsMap
CREDITS_MAP_VERMILION_CITY,
CREDITS_MAP_ROUTE10,
CREDITS_MAP_CELADON_CITY,
CREDITS_MAP_SAFFRON_CITY_DUPLICATE,
CREDITS_MAP_SAFFRON_CITY,
CREDITS_MAP_ROUTE17,
CREDITS_MAP_FUCHSIA_CITY,
CREDITS_MAP_CINNABAR_ISLAND,
@@ -412,7 +412,7 @@ static const struct CreditsScrcmd sCreditsScript[] = {
CREDITS_PRINT(BRAILLE_CODE_CHECK, 221),
CREDITS_PRINT(INFORMATION_SUPERVISORS, 221),
CREDITS_PRINT(DUMMY, 51),
CREDITS_MAPNEXT(SAFFRON_CITY_DUPLICATE, 16),
CREDITS_MAPNEXT(SAFFRON_CITY, 16),
CREDITS_PRINT(COORDINATORS, 211),
CREDITS_PRINT(TASK_MANAGERS, 210),
CREDITS_PRINT(PRODUCERS, 210),
@@ -619,7 +619,7 @@ static const struct CreditsOverworldCmd sOverworldCmd_CeladonCity[] = {
};
static const struct CreditsOverworldCmd sOverworldCmd_SaffronCity[] = {
{ 0x00fe, MAP_GROUP(SAFFRON_CITY_DUPLICATE), MAP_NUM(SAFFRON_CITY_DUPLICATE) },
{ 0x00fe, MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY) },
{ 0x0027, 0x0005, 0x0001 },
{ 0x0000, 0x0001, 0x0500 }, // Scroll down
{ 0x00fd, 0x00fd, 0x00fd }
src/heal_location.c
+1 -1
View File
@@ -19,7 +19,7 @@ static const struct HealLocation sSpawnPoints[] = {
[SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY), 0x19, 0x20},
[SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND), 0x0e, 0x0c},
[SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), 0x0b, 0x07},
[SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY_DUPLICATE), MAP_NUM(SAFFRON_CITY_DUPLICATE), 0x18, 0x27},
[SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY), 0x18, 0x27},
[SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4), 0x0c, 0x06},
[SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10), 0x0d, 0x15},
[SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND), MAP_NUM(ONE_ISLAND), 0x0e, 0x06},