diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /src/credits.c | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
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 270a4d045..ad78d875c 100644 --- a/src/credits.c +++ b/src/credits.c @@ -750,7 +750,7 @@ static void CB2_Credits(void) sCreditsMgr->unk_1D++; break; case 2: - FlagClear(0x4000); + FlagClear(FLAG_SPECIAL_FLAG_0x4000); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_OFF; Free(sCreditsMgr); SoftReset(RESET_ALL); @@ -797,7 +797,7 @@ static bool32 DoOverworldMapScrollScene(UNUSED u8 unused) switch (sCreditsMgr->subseqno) { case 0: - FlagSet(0x4000); + FlagSet(FLAG_SPECIAL_FLAG_0x4000); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_KEEP; sCreditsMgr->ovwldseqno = 0; sCreditsMgr->subseqno++; |