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/Route111 | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'data/maps/Route111')
| -rw-r--r-- | data/maps/Route111/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route111/scripts.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 938dbcff1..014ac084c 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 281dddf0c..322c9a2b7 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -126,7 +126,7 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 special StartMirageTowerShake waitstate delay 24 - playse SE_RU_HYUU + playse SE_FALL addobject LOCALID_PLAYER_FALLING special StartPlayerDescendMirageTower waitstate @@ -268,14 +268,14 @@ Route111_Movement_PushRightFromRoute: @ 81F0FAE Route111_EventScript_SunTrigger:: @ 81F0FB0 setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_SandstormTrigger:: @ 81F0FBD setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end |