diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /src/credits.c | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/credits.c')
| -rw-r--r-- | src/credits.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/credits.c b/src/credits.c index f47cc79c4..270a4d045 100644 --- a/src/credits.c +++ b/src/credits.c @@ -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 } |