diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
| commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
| tree | 393b23af98581a7dec2e0731732a23ece4b23007 /data/maps/MtPyre_Summit | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'data/maps/MtPyre_Summit')
| -rw-r--r-- | data/maps/MtPyre_Summit/map.json | 2 | ||||
| -rw-r--r-- | data/maps/MtPyre_Summit/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 87a1ad977..aa3341f8a 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 9daf02f5b..c2692ff20 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -39,7 +39,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 end MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown |