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/Route121 | |
| parent | 38d4fc9c17467bfbb206116e4bef4648cedfe3d4 (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-rayscene
Diffstat (limited to 'data/maps/Route121')
| -rw-r--r-- | data/maps/Route121/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route121/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index f4b4f5e84..e956f6251 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1a7591a93..fdc191ea8 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -19,7 +19,7 @@ Route121_EventScript_SafariZoneSign:: @ 81F5E0F Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18 lockall - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT |