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/field_effect.c | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index c0d7d3463..b8269ae46 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2889,7 +2889,7 @@ u8 FldEff_UseSurf(void) u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - if (sub_8056124(MUS_NAMINORI)) + if (Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) Overworld_ChangeMusicTo(MUS_NAMINORI); return FALSE; } |