diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-09 13:07:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 13:07:59 -0500 |
| commit | 9f2ac797d3de444ed509c138f08ba9209c4e1967 (patch) | |
| tree | f47a46c56c7b3ecefd454ece378685a67e4883e7 /data | |
| parent | bef2668d8bf92f8d42e2d56b06260380d7175d93 (diff) | |
| parent | 0f3e26f9a406caafbad02d39b15137efe5fb3ecd (diff) | |
Merge pull request #485 from cbt6/movement
Rename some movement actions and functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 14 | ||||
| -rw-r--r-- | data/maps/CinnabarIsland/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/FourIsland_PokemonDayCare/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/FuchsiaCity/map.json | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 81419e08a..452a32aa9 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -115,11 +115,11 @@ BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348 end Movement_DeoxysApproach: @ 8165353 - walk_slowest_down - walk_slowest_down - walk_slowest_down - walk_slowest_down - walk_slowest_down - walk_slowest_down - walk_slowest_down + walk_slower_down + walk_slower_down + walk_slower_down + walk_slower_down + walk_slower_down + walk_slower_down + walk_slower_down step_end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 179c06a51..073fc6c94 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -251,8 +251,8 @@ CinnabarIsland_Movement_BoatArrive:: @ 8167195 walk_fast_left walk_fast_left walk_left - walk_slowest_left - walk_slowest_left + walk_slower_left + walk_slower_left step_end CinnabarIsland_Movement_BillBoardBoat:: @ 816719D diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 9a2d609b9..0beeafb08 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -170,7 +170,7 @@ FourIsland_PokemonDayCare_Movement_RetrieveMon:: @ 8171B71 delay_16 delay_16 face_up - walk_slowest_up + walk_slower_up set_invisible delay_16 delay_16 @@ -179,7 +179,7 @@ FourIsland_PokemonDayCare_Movement_RetrieveMon:: @ 8171B71 delay_16 face_down set_visible - walk_slowest_down + walk_slower_down step_end @ Unused. Possibly a commented script, or a typo end added to the above Movement script diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 7363a4b82..9a1f3f504 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -49,7 +49,7 @@ "x": 36, "y": 15, "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWEST", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWER", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", |