diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 08:08:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 08:08:51 -0500 |
| commit | bebcea402921d23232f7657fcfdab810f8699399 (patch) | |
| tree | a59ea431d486bf23cde76e35ca789d1a0d113f3e /data/scripts/maps/SouthernIsland_Interior.inc | |
| parent | f810c9ecade3d793a139f67cd8f63effc5644b99 (diff) | |
| parent | e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff) | |
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
Diffstat (limited to 'data/scripts/maps/SouthernIsland_Interior.inc')
| -rw-r--r-- | data/scripts/maps/SouthernIsland_Interior.inc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index b7d4e101c..432667cc9 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -66,7 +66,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if 0, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_0x002 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SouthernIsland_Interior_Movement_242BCA waitmovement 0 delay 50 @@ -80,7 +80,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 applymovement 2, SouthernIsland_Interior_Movement_242BDA waitmovement 0 delay 50 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 @@ -132,36 +132,36 @@ SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SouthernIsland_Interior_Movement_242BCE: @ 8242BCE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up step_end SouthernIsland_Interior_Movement_242BDA: @ 8242BDA - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down step_end |