Merge branch 'master' into doc-rayscene

This commit is contained in:
GriffinR
2020-08-28 16:17:11 -04:00
committed by GitHub
1187 changed files with 10778 additions and 10928 deletions

View File

@@ -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