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/SootopolisCity | |
| parent | 38d4fc9c17467bfbb206116e4bef4648cedfe3d4 (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-rayscene
Diffstat (limited to 'data/maps/SootopolisCity')
| -rw-r--r-- | data/maps/SootopolisCity/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SootopolisCity/scripts.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 41e5cf61a..d4c71db61 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 97081c250..e6ceb6418 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -531,7 +531,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate - playse SE_T_KAMI + playse SE_THUNDER special SpawnCameraObject applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp waitmovement 0 @@ -562,7 +562,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_RUNECITY + fadenewbgm MUS_SOOTOPOLIS delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32 @@ -615,7 +615,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53 |