summaryrefslogtreecommitdiff
path: root/src/clock.c
diff options
context:
space:
mode:
authorMCboy <atasro2@gmail.com>2018-08-12 23:26:00 +0430
committerGitHub <noreply@github.com>2018-08-12 23:26:00 +0430
commit1bc93c5a66ebc7ec790e3cb17f246aee75dcc73c (patch)
treef6edf1981a206483d1691e5ac388055abfc64424 /src/clock.c
parent9e9ec8dc963c4786ac3af19102ebe690cb7785d5 (diff)
parent21060091d109a6ebc4d1d76b8487878bb91cd5e1 (diff)
Merge branch 'master' into player_field_avatar
Diffstat (limited to 'src/clock.c')
-rw-r--r--src/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clock.c b/src/clock.c
index 71c433ed2..91eb5f16d 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -83,11 +83,11 @@ static void UpdatePerMinute(struct Time *localTime)
static void ReturnFromStartWallClock(void)
{
InitTimeBasedEvents();
- SetMainCallback2(CB2_ReturnToFieldContinueScript);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
void StartWallClock(void)
{
- SetMainCallback2(Cb2_StartWallClock);
+ SetMainCallback2(CB2_StartWallClock);
gMain.savedCallback = ReturnFromStartWallClock;
}