diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /src/credits.c | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
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++; |