summaryrefslogtreecommitdiff
path: root/asm/overworld.s
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-09 20:33:28 -0400
committerGitHub <noreply@github.com>2019-10-09 20:33:28 -0400
commitc61603fb3812011981e22478bce93aba8b7ec183 (patch)
tree0bcf628e1f3615159cbae3e5c638825544699182 /asm/overworld.s
parent77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff)
parentf3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff)
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'asm/overworld.s')
-rw-r--r--asm/overworld.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/overworld.s b/asm/overworld.s
index ec8a03ddd..81651a0ad 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -2441,7 +2441,7 @@ _08055E40:
lsls r0, 24
cmp r0, 0
beq _08055E5A
- ldr r5, _08055E74 @ =0x00000131 @ BGM_FRLG_SURF
+ ldr r5, _08055E74 @ =0x00000131 @ MUS_NAMINORI
adds r0, r5, 0
bl sub_8056124
cmp r0, 0
@@ -2511,7 +2511,7 @@ _08055EA8:
bl GetCurrentMapMusic
lsls r0, 16
lsrs r6, r0, 16
- ldr r5, _08055F08 @ =0x00000131 @ BGM_FRLG_SURF
+ ldr r5, _08055F08 @ =0x00000131 @ MUS_NAMINORI
cmp r6, r5
beq _08055F14
movs r0, 0x8