diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:49:16 -0400 |
| commit | 0e217e22d8fa3e075416cb332435c3756548357e (patch) | |
| tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /src/sound.c | |
| parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
| parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound.c b/src/sound.c index dc4b9f604..41b9f5b7d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -15,7 +15,7 @@ struct Fanfare }; // TODO: what are these -extern u8 gUnknown_2031DD8; +extern u8 gDisableMapMusicChangeOnMapLoad; extern u8 gUnknown_203ADFA; extern u8 gUnknown_203F174; @@ -571,7 +571,7 @@ void PlayBGM(u16 songNum) void PlaySE(u16 songNum) { - if(gUnknown_2031DD8 == 0 && gUnknown_203ADFA != 2) + if(gDisableMapMusicChangeOnMapLoad == 0 && gUnknown_203ADFA != 2) m4aSongNumStart(songNum); } |