diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
tree | a96f8cc5e480114dadd1362372da0606c26bc928 /src/credits.c | |
parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/credits.c')
-rw-r--r-- | src/credits.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/credits.c b/src/credits.c index 12240c98f..58647f7b1 100644 --- a/src/credits.c +++ b/src/credits.c @@ -738,7 +738,7 @@ static void CB2_Credits(void) sCreditsMgr->unk_1D++; break; case 2: - FlagClear(FLAG_SPECIAL_FLAG_0x4000); + FlagClear(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_OFF; Free(sCreditsMgr); SoftReset(RESET_ALL); @@ -785,7 +785,7 @@ static bool32 DoOverworldMapScrollScene(UNUSED u8 unused) switch (sCreditsMgr->subseqno) { case 0: - FlagSet(FLAG_SPECIAL_FLAG_0x4000); + FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_KEEP; sCreditsMgr->ovwldseqno = 0; sCreditsMgr->subseqno++; |