diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:17:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:17:11 -0400 |
| commit | 0cfc279af54aa1f21f08acd4043cf82be771c8a4 (patch) | |
| tree | 464418e98106f5a4ac5a7db31415d8393e40aced /data/maps/RusturfTunnel | |
| parent | 38d4fc9c17467bfbb206116e4bef4648cedfe3d4 (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-rayscene
Diffstat (limited to 'data/maps/RusturfTunnel')
| -rw-r--r-- | data/maps/RusturfTunnel/map.json | 2 | ||||
| -rw-r--r-- | data/maps/RusturfTunnel/scripts.inc | 2 |
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 |