summaryrefslogtreecommitdiff
path: root/data/maps/Route22
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
commitbb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch)
treecb094078122b217fc67e2285614b79c6e83eaf88 /data/maps/Route22
parentc5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff)
Give songs meaningful english names
Diffstat (limited to 'data/maps/Route22')
-rw-r--r--data/maps/Route22/map.json2
-rw-r--r--data/maps/Route22/scripts.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index 00ac3625a..a00677beb 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -2,7 +2,7 @@
"id": "MAP_ROUTE22",
"name": "Route22",
"layout": "LAYOUT_ROUTE22",
- "music": "MUS_LOAD02",
+ "music": "MUS_ROUTE3",
"region_map_section": "MAPSEC_ROUTE_22",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index dbc10e129..177269724 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -23,7 +23,7 @@ Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
Route22_EventScript_EarlyRival:: @ 81682BE
textcolor 0
- playbgm MUS_RIVAL1, 0
+ playbgm MUS_ENCOUNTER_RIVAL, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq Route22_EventScript_EarlyRivalApproach
@@ -42,7 +42,7 @@ Route22_EventScript_EarlyRival:: @ 81682BE
msgbox Route22_Text_EarlyRivalPostBattle
closemessage
delay 10
- playbgm MUS_RIVAL2, 0
+ playbgm MUS_RIVAL_EXIT, 0
compare VAR_TEMP_1, 0
call_if_eq Route22_EventScript_EarlyRivalExit
compare VAR_TEMP_1, 1
@@ -183,7 +183,7 @@ Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
Route22_EventScript_LateRival:: @ 816841F
textcolor 0
- playbgm MUS_RIVAL1, 0
+ playbgm MUS_ENCOUNTER_RIVAL, 0
addobject 1
compare VAR_TEMP_1, 0
call_if_eq Route22_EventScript_LateRivalApproach
@@ -202,7 +202,7 @@ Route22_EventScript_LateRival:: @ 816841F
msgbox Route22_Text_LateRivalPostBattle
closemessage
delay 10
- playbgm MUS_RIVAL2, 0
+ playbgm MUS_RIVAL_EXIT, 0
applymovement 1, Route22_Movement_LateRivalExit
waitmovement 0
fadedefaultbgm