diff options
author | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
commit | d8bb1d15e7941d9689393f1215c82788a793af50 (patch) | |
tree | 7006f3de7d3cf5a0fce6af66bd182d3d3f985854 /src/text.c | |
parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'src/text.c')
-rw-r--r-- | src/text.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text.c b/src/text.c index a13ed162d..5db3ba308 100644 --- a/src/text.c +++ b/src/text.c @@ -2418,12 +2418,12 @@ _08005ABA:\n\ strb r0, [r6, #0x9]\n\ b _08005A0A\n\ _08005ABE:\n\ - ldr r0, =gMPlay_BGM\n\ + ldr r0, =gMPlayInfo_BGM\n\ bl m4aMPlayStop\n\ b _08005A0A\n\ .pool\n\ _08005ACC:\n\ - ldr r0, =gMPlay_BGM\n\ + ldr r0, =gMPlayInfo_BGM\n\ bl m4aMPlayContinue\n\ b _08005A0A\n\ .pool\n\ |