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

Merge branch 'master' into weather-15

Browse Source
This commit is contained in:
Phlosioneer
2019-02-25 02:30:35 -05:00
parent e1b2460748 a589d4a630
commit 1cd5cb09cf
201 changed files with 4074 additions and 7996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/maps/SkyPillar_Outside/scripts.inc
View File

@@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
return
SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
return
SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
@@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
lockall
applymovement 1, SkyPillar_Outside_Movement_2393D3
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
closemessage
@@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
special sub_8139560
waitstate
delay 20
applymovement 1, SkyPillar_Outside_Movement_2725A4
applymovement 1, Common_Movement_WalkInPlaceLeft
waitmovement 0
delay 10
applymovement 1, SkyPillar_Outside_Movement_2725A8
applymovement 1, Common_Movement_WalkInPlaceRight
waitmovement 0
delay 20
applymovement 1, SkyPillar_Outside_Movement_2725AA
applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT