dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into ObjEvent rename

Browse Source
This commit is contained in:
GriffinR committed 2019-12-21 05:19:27 -05:00
2 parents 949509aade 026e1108b2
commit 68cdd7b1cb
67 files changed
+1026 -822
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/SootopolisCity/scripts.inc
+2 -2
View File
@@ -547,7 +547,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
fadenewbgm MUS_RUNECITY
delay 120
clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32
waitstate
end
@@ -600,7 +600,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
fadenewbgm MUS_NAMINORI
delay 120
clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53
waitstate
end