summaryrefslogtreecommitdiff
path: root/data/maps/RusturfTunnel
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-28 16:14:21 -0400
committerGitHub <noreply@github.com>2020-08-28 16:14:21 -0400
commit09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (patch)
treed90353c1a06b199c585fdc258c049583392dc09f /data/maps/RusturfTunnel
parenteb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff)
parentee72696b5340b5578941aeb5d03bca6099e26538 (diff)
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'data/maps/RusturfTunnel')
-rw-r--r--data/maps/RusturfTunnel/map.json2
-rw-r--r--data/maps/RusturfTunnel/scripts.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index 0d6ae7d9b..d8531c879 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -2,7 +2,7 @@
"id": "MAP_RUSTURF_TUNNEL",
"name": "RusturfTunnel",
"layout": "LAYOUT_RUSTURF_TUNNEL",
- "music": "MUS_DAN01",
+ "music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_RUSTURF_TUNNEL",
"requires_flash": false,
"weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index a342135bf..17a229ab5 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -316,7 +316,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF
RusturfTunnel_EventScript_Grunt:: @ 822D0C2
lock
faceplayer
- playbgm MUS_AQA_0, 0
+ playbgm MUS_ENCOUNTER_AQUA, 0
msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat
msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT