summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-09 20:02:59 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-09 20:02:59 -0400
commit855c052be041ed85789db1e460dd35cab9d12b4f (patch)
tree35dcf54a3b48510c01c721e2733646ed597ff79a /asm
parent734cada66a2d9938cdc9a2806f68352d06da6e9a (diff)
Rename song constants using Japanese sound test menu
Diffstat (limited to 'asm')
-rw-r--r--asm/bike.s4
-rw-r--r--asm/hall_of_fame.s2
-rw-r--r--asm/overworld.s4
3 files changed, 5 insertions, 5 deletions
diff --git a/asm/bike.s b/asm/bike.s
index 94583aa47..4d2683968 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -738,8 +738,8 @@ _080BD5F4: .4byte gPlayerAvatar
_080BD5F8:
adds r0, r2, 0
bl SetPlayerAvatarTransitionFlags
- movs r4, 0x8D @ BGM_FRLG_BICYCLE
- lsls r4, 1 @ BGM_FRLG_BICYCLE
+ movs r4, 0x8D @ MUS_CYCLING
+ lsls r4, 1 @ MUS_CYCLING
adds r0, r4, 0
bl sub_8056124
cmp r0, 0
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index ce675d88e..fbb7cdc9c 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -138,7 +138,7 @@ _080F1EC4:
bne _080F1EF0
ldr r0, _080F1EEC @ =sub_80F1DC0
bl SetMainCallback2
- movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
+ movs r0, 0x8F @ MUS_DENDOU >> 1
lsls r0, 1
bl PlayBGM
movs r0, 0
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