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

update applymovement to remove magic numbers

Browse Source
This commit is contained in:
Melody
2018-12-19 14:08:01 -05:00
parent b2ac3b6d6f
commit 5e6ceeb631
114 changed files with 531 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
data/maps/SootopolisCity/scripts.inc
View File

@@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926
SootopolisCity_EventScript_1E5946:: @ 81E5946
delay 60
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5A68
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather 15
@@ -269,12 +269,12 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0
waitmovement 0
special SpawnScriptEventObject
special SpawnCameraObject
applymovement 10, SootopolisCity_Movement_1E5BD6
applymovement 9, SootopolisCity_Movement_1E5BF7
applymovement 127, SootopolisCity_Movement_1E5A75
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
setvar VAR_0x405E, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
releaseall
@@ -312,10 +312,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75
SootopolisCity_EventScript_1E5A82:: @ 81E5A82
delay 60
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5BA4
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
setweather 15
@@ -369,12 +369,12 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
applymovement 10, SootopolisCity_Movement_1E5BCF
applymovement 9, SootopolisCity_Movement_1E5BF0
waitmovement 0
special SpawnScriptEventObject
special SpawnCameraObject
applymovement 10, SootopolisCity_Movement_1E5BD6
applymovement 9, SootopolisCity_Movement_1E5BF7
applymovement 127, SootopolisCity_Movement_1E5BAE
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
setvar VAR_0x405E, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
releaseall
@@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
delay 60
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5A68
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
call SootopolisCity_EventScript_1E5D82
@@ -516,8 +516,8 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special sub_813B7D8
waitstate
playse SE_T_KAMI
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5E63
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
waitmovement 0
waitse
playmoncry SPECIES_RAYQUAZA, 2
@@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
delay 60
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5BA4
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
waitmovement 0
special RemoveScriptEventObject
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
call SootopolisCity_EventScript_1E5D82
@@ -568,9 +568,9 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
setvar VAR_0x8004, 1
special sub_813B7D8
waitstate
special SpawnScriptEventObject
applymovement 127, SootopolisCity_Movement_1E5E63
applymovement 255, SootopolisCity_Movement_1E5E68
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E5E68
waitmovement 0
waitse
playmoncry SPECIES_RAYQUAZA, 2
@@ -974,18 +974,18 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC
msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT
closemessage
applymovement 7, SootopolisCity_Movement_1E62D4
applymovement 255, SootopolisCity_Movement_1E630E
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E630E
waitmovement 0
delay 120
applymovement 1, SootopolisCity_Movement_1E6341
waitmovement 0
applymovement 7, SootopolisCity_Movement_1E6344
applymovement 255, SootopolisCity_Movement_1E634F
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E634F
waitmovement 0
msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT
closemessage
setflag FLAG_0x133
applymovement 255, SootopolisCity_Movement_1E635A
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A
waitmovement 0
warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
waitstate
@@ -993,13 +993,13 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC
SootopolisCity_EventScript_1E6243:: @ 81E6243
applymovement 7, SootopolisCity_Movement_1E6267
applymovement 255, SootopolisCity_Movement_1E628C
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E628C
waitmovement 0
return
SootopolisCity_EventScript_1E6255:: @ 81E6255
applymovement 7, SootopolisCity_Movement_1E6267
applymovement 255, SootopolisCity_Movement_1E62B0
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E62B0
waitmovement 0
return