summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-20 17:47:51 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-20 17:47:51 -0500
commit2c7a4e1406b078cf9bcc2a16e92a58497390aa17 (patch)
treec17f6d2ea77a8772a643973a00684efc40d6838e /data/scripts
parentab8373bbd57f1498df89ace04697eb4a2b5bc1d6 (diff)
Use MUS_ prefix instead of BGM_ prefix for songs
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/scripts/contest_hall.inc4
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/players_house.inc4
4 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 286a2786f..c78c4ab9e 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -113,7 +113,7 @@ Route102_EventScript_1A161D:: @ 81A161D
goto_if_eq Route102_EventScript_1A1642
special EventObjectInteractionRemoveBerryTree
message Route102_Text_1A17FD
- playfanfare BGM_ME_KINOMI
+ playfanfare MUS_ME_KINOMI
waitmessage
waitfanfare
waitbuttonpress
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index ec603257d..c5b4cf660 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
- playbgm BGM_CON_FAN, FALSE
+ playbgm MUS_CON_FAN, FALSE
return
LinkContestRoom1_EventScript_1A5984:: @ 81A5984
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
setflag FLAG_SYS_RIBBON_GET
lockall
msgbox LinkContestRoom1_Text_1A6D6A, 4
- playfanfare BGM_FANFA4
+ playfanfare MUS_FANFA4
msgbox LinkContestRoom1_Text_1A6D96, 4
waitfanfare
special sub_80C4858
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 8d226887e..56ed0d9ab 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298
Route117_EventScript_1B22B2:: @ 81B22B2
message Route117_Text_1B27A2
- playfanfare BGM_FANFA1
+ playfanfare MUS_FANFA1
waitfanfare
waitmessage
waitbuttonpress
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a1a99fa89..9f0e67cb6 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
waitmovement 0
- playbgm BGM_INTER_V, FALSE
+ playbgm MUS_INTER_V, FALSE
msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4
closemessage
applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
@@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
waitmovement 0
- playbgm BGM_INTER_V, FALSE
+ playbgm MUS_INTER_V, FALSE
msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4
closemessage
applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE