diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 01:00:38 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 01:00:38 -0500 |
| commit | 7f55319c00dfedeadbb73719dd38c3173de9c1f0 (patch) | |
| tree | e2503a9c304471a57685e8c4141596ff422142a2 | |
| parent | 78b44870080fd5ab3f14002bfdb00540c132a3c8 (diff) | |
Use movement type constants
359 files changed, 1649 insertions, 1649 deletions
diff --git a/data/map_events.s b/data/map_events.s index a18b8b4aa..ce4d9efc3 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,5 @@ @#include "constants/bg_event_constants.h" -@#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json index aebc124e1..e1eaed672 100644 --- a/data/maps/BattleColosseum2P/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index a00613e92..79a032876 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -18,7 +18,7 @@ "x": 15, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 15, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 0feaa5fe5..bab2d1b5e 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index efca328f8..5a4644854 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -29,7 +29,7 @@ "x": 48, "y": 15, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 38, "y": 14, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 36, "y": 14, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 11, "y": 18, "elevation": 3, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 4, "movement_range_y": 4, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 18, "y": 22, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 5, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 30, "y": 24, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 26, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -120,7 +120,7 @@ "x": 38, "y": 31, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, "trainer_type": 0, @@ -133,7 +133,7 @@ "x": 9, "y": 30, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -146,7 +146,7 @@ "x": 52, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -159,7 +159,7 @@ "x": 40, "y": 35, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 25, "y": 10, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -185,7 +185,7 @@ "x": 65529, "y": 21, "elevation": 7, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 34, @@ -198,7 +198,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -211,7 +211,7 @@ "x": 47, "y": 24, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index b9d14c154..a6f29e9d7 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 9, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 13, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 5, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 9f80e8e96..33248a953 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 6, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 6, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index b468bf984..e491e8112 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -18,7 +18,7 @@ "x": 0, "y": 10, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 10, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 0, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 3b94da798..717bfc4a1 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 3db8fd602..afa57c1aa 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 566deb0a9..fdb27ab7e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 10, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 8, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 11, "y": 6, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 9288edf21..76bc95d25 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 9, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 9, "y": 14, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8f13009f7..059ff30e3 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 11, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 3, "y": 13, "elevation": 0, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 4686cea40..65b0fe9bc 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 6, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 1, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index bde4fd50b..71eea9cee 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 3056f37d1..081d3fac9 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 4, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 7, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 10, "y": 9, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 13, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 16, "y": 10, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 11, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 15a8770af..c873cd0bb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 81b0a0954..88187cdc9 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 11, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 9, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 10, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 8, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -122,7 +122,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 04c2602a4..6ab82e945 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 36ea4b0df..455e9d836 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 8, "y": 4, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 0, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 84b6c620c..7d2af91a9 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index efb05b214..7a4c45752 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index e64cc7298..9681ddfb2 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -18,7 +18,7 @@ "x": 12, "y": 7, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 4, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 7, "elevation": 0, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 65e99c9d2..eb95b5c79 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 25, "y": 5, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 7, "y": 21, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 13, "y": 21, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 5, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 14, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 11, "y": 21, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 9, "y": 18, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index e3fe97b91..2ce780fdd 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 29, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 33, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 33, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 33, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 25, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 28, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 30, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 9, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 23, "y": 16, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 13, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 4, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 10, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 4245e8a07..a5c9110e4 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -18,7 +18,7 @@ "x": 31, "y": 9, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 32, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 37, "y": 1, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 38, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 35, "y": 1, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 37, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 35, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 4, "y": 1, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 6, "y": 1, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 87d7dd8bf..12f4bce2d 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -39,7 +39,7 @@ "x": 31, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -52,7 +52,7 @@ "x": 33, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -65,7 +65,7 @@ "x": 16, "y": 21, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, "trainer_type": 0, @@ -78,7 +78,7 @@ "x": 9, "y": 23, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -91,7 +91,7 @@ "x": 32, "y": 29, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -104,7 +104,7 @@ "x": 33, "y": 29, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -117,7 +117,7 @@ "x": 34, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -130,7 +130,7 @@ "x": 22, "y": 0, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -143,7 +143,7 @@ "x": 26, "y": 32, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -156,7 +156,7 @@ "x": 50, "y": 18, "elevation": 10, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 27, @@ -169,7 +169,7 @@ "x": 12, "y": 30, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -182,7 +182,7 @@ "x": 1, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 0f3aec9c9..0df8aff83 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index e707b7c3e..887052f22 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 12, "elevation": 0, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 4, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 7, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index b2e5699ec..28638c847 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index aee9d5bbe..e5256bcae 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 8ada074dd..6bf3369af 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index cfa2c4d36..7204d1bb0 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index b1b38b2ff..01629e369 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index fcf185a81..22d3f35a8 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 2, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 1, "y": 7, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 976935818..0e204e42a 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 837ab4956..1ba1ae547 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index c83feff7b..793eb7016 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -29,7 +29,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 11, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 20, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 23, "y": 7, "elevation": 1, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index b67761ea8..36ef2b0cf 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -18,7 +18,7 @@ "x": 25, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 25, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 17, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 16, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 16, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 4, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 4, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 24, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 0febfbc73..d0233f91e 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 8, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 7d2f4f416..45ed90320 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index bd8c9d41e..8ba56684a 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 8db54fd38..cb2aa4d61 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index fcc7c282d..1a50f1208 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 8, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 1710cc88c..fedab09af 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index c8c7f0414..247b09136 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 347f76e17..b3571f8da 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index aef56bde7..d713ceb6c 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index fa6366c19..04fec1512 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -29,7 +29,7 @@ "x": 8, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 16, "y": 10, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 32, "y": 9, "elevation": 4, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 56, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index fb35c7b47..0e528b645 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 9de0bb25c..d458cf042 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index c316f2bc6..4b12a73c5 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 5f1389b26..22da4145b 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 980df7a4b..2cf3514e1 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 3b08bf303..c06c279eb 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 67626feb7..0131d8a66 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 41b48cce9..02f11435c 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 17b9542f4..bc0d6f5cd 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 24abad1d6..ac63bc97c 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 2b4630ca3..4c7e900d3 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -29,7 +29,7 @@ "x": 18, "y": 18, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 17, "y": 5, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 11, "y": 27, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 8, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 19, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 12, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 3, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 7aac310dc..7390a3997 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -24,7 +24,7 @@ "x": 8, "y": 44, "elevation": 4, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 12, "y": 6, "elevation": 3, - "movement_type": "21", + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 14, "y": 17, "elevation": 3, - "movement_type": "19", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 17, "y": 31, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 4, "y": 47, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 82c5e2a44..9e48279b1 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index d28b198ce..804ba796f 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index dba3d3d21..41929c967 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -24,7 +24,7 @@ "x": 44, "y": 10, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 33, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 12, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 23, "y": 9, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 33, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 33, "y": 3, "elevation": 3, - "movement_type": "46", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 10, "movement_range_y": 1, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 56, "y": 7, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -115,7 +115,7 @@ "x": 39, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 570c291b4..473b522b8 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 3bc0ee2c9..def5fa6fd 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -18,7 +18,7 @@ "x": 15, "y": 11, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 17, "y": 15, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 27, "y": 16, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 25, "y": 11, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "16", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 27, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 8, "y": 25, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 17, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 1, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 0dc66d822..899a7e92e 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -29,7 +29,7 @@ "x": 14, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 4e8aab27c..f88bce64e 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -18,7 +18,7 @@ "x": 16, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 13, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 14, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 17, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 26, "y": 19, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 5, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 32, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 8, "y": 25, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 36, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 31, "y": 21, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 0b3ede231..b0188aedd 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 8320de554..902c65f23 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index f9ef214bb..330c8ea8a 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 39aaec8e8..5928013dc 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index d8ba2545e..dd1d81a2d 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 21, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index ade705c51..9af9a6faf 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 13, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 12, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 553467495..eb022af3b 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 0, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 9, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 6, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 9, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 10, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 0, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 0, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 1, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 9, "y": 0, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -187,7 +187,7 @@ "x": 10, "y": 0, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -200,7 +200,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 11985d6a9..c5e589e61 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 8, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index c41dd4742..b3427d8b1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index af9538b03..2e201dafc 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 27f280e43..d6fd3c4f3 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 35a26edc6..c142ff4c1 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -34,7 +34,7 @@ "x": 37, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -47,7 +47,7 @@ "x": 36, "y": 15, "elevation": 3, - "movement_type": "80", + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -60,7 +60,7 @@ "x": 33, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -73,7 +73,7 @@ "x": 33, "y": 11, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -86,7 +86,7 @@ "x": 39, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -99,7 +99,7 @@ "x": 14, "y": 15, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -112,7 +112,7 @@ "x": 12, "y": 20, "elevation": 1, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -125,7 +125,7 @@ "x": 36, "y": 20, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -138,7 +138,7 @@ "x": 8, "y": 8, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -151,7 +151,7 @@ "x": 16, "y": 9, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -164,7 +164,7 @@ "x": 30, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -177,7 +177,7 @@ "x": 21, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -190,7 +190,7 @@ "x": 32, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -203,7 +203,7 @@ "x": 24, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -216,7 +216,7 @@ "x": 15, "y": 11, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -229,7 +229,7 @@ "x": 40, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index b018a2b1e..763dfb3e8 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index cacf8a3ab..3ca93c166 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 12, "y": 16, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 2, "y": 9, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 11, "y": 11, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 13, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 2, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 7, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 11, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index d9cb2b507..60a811b30 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index a3619a5ef..06be2ceca 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 2c5f0837a..d5a729342 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 357b824d5..00852040b 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 8684bc17e..d2e1eee01 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 13, "y": 3, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6ce142aac..b1ba15c2f 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 625d4098b..b4b0e9f82 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 499deb4c9..a4cf1b1a0 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 314a75275..c5bb07e8d 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -24,7 +24,7 @@ "x": 11, "y": 6, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 11, "y": 6, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 4bc3abec2..f214403c3 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 0, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 13, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 14, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 23, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 22, "y": 9, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 16, "y": 15, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 23, "y": 9, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 7298dc99f..1fb14c475 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index cac78d8e1..1f1558026 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -34,7 +34,7 @@ "x": 19, "y": 10, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -47,7 +47,7 @@ "x": 12, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -60,7 +60,7 @@ "x": 10, "y": 7, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index e026daa1a..a8c213f2e 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 109ea9cde..8ab54cc35 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index cccd65956..559373234 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index c8aef2900..8a8f6794b 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index beefaa49a..07faa3edd 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 95890a431..2d5c7bb6d 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 7e0cb8dad..ba7d80bf8 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -18,7 +18,7 @@ "x": 29, "y": 45, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 41, "y": 40, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 42, "y": 40, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 22, "y": 35, "elevation": 3, - "movement_type": "46", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 5, "movement_range_y": 3, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 15, "y": 28, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 14, "y": 42, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 29, "y": 41, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 30, "y": 42, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 22, "y": 45, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 17, "y": 46, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 36, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 34, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 36, "y": 15, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -187,7 +187,7 @@ "x": 35, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -200,7 +200,7 @@ "x": 35, "y": 17, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -213,7 +213,7 @@ "x": 18, "y": 39, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -226,7 +226,7 @@ "x": 19, "y": 40, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -239,7 +239,7 @@ "x": 13, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -252,7 +252,7 @@ "x": 38, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -265,7 +265,7 @@ "x": 48, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index c8e3cf79e..ef0279300 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -18,7 +18,7 @@ "x": 18, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 23, "y": 16, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 20, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 19, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 21, "y": 15, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 965fdaa58..0ad52b863 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 3, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 645a76950..0b5d948c5 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index a1d6f74d4..a0ef82ad6 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 12, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 1, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 85f9e084e..e3c5ef182 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 78e5824b8..386b21e43 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 26, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 28, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 4, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 7, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index dc8ab175e..43ad7e409 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 7, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index e37d10962..41401439d 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 8, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index cd8f39c65..50f1e424d 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -18,7 +18,7 @@ "x": 40, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 33, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 19, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 13, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 13, "y": 21, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 38, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 9, "y": 35, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 7, "y": 34, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 15, "y": 26, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 1a1de5162..e32b5f379 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -18,7 +18,7 @@ "x": 20, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 36, "y": 30, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 30, "y": 35, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 33, "y": 4, "elevation": 3, - "movement_type": "47", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 5, "movement_range_y": 3, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 7, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 13, "y": 17, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 7, "y": 10, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 2, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 11, "y": 35, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 26, "y": 32, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 42, "y": 35, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 44, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -187,7 +187,7 @@ "x": 42, "y": 7, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index deb0a6c79..ac65802cb 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -18,7 +18,7 @@ "x": 13, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 14, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 13, "y": 11, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 37, "y": 21, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 12, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 35, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 18, "y": 27, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 30, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 35, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 24, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 3, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 656956abc..c655f9252 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index c19fdb1a0..752411223 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 11808290f..91981c25d 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 6, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index e79709023..638eb4ff8 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -29,7 +29,7 @@ "x": 12, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 16, "y": 12, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 13, "y": 9, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 66fda50c4..2db30c3c5 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index b481baf9b..c7a147ca9 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 48ad4a077..2da693dce 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 7e12d3946..719fae823 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -24,7 +24,7 @@ "x": 11, "y": 32, "elevation": 1, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 17, "y": 132, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 7, "y": 39, "elevation": 1, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 6, "movement_range_y": 3, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 19, "y": 79, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 15, "y": 25, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 9, "y": 53, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 7, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 18, "y": 105, "elevation": 4, - "movement_type": "50", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 1, "movement_range_y": 4, "trainer_type": 1, @@ -115,7 +115,7 @@ "x": 16, "y": 64, "elevation": 3, - "movement_type": "27", + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -128,7 +128,7 @@ "x": 11, "y": 64, "elevation": 3, - "movement_type": "28", + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -141,7 +141,7 @@ "x": 11, "y": 89, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -154,7 +154,7 @@ "x": 9, "y": 108, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -167,7 +167,7 @@ "x": 8, "y": 68, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -180,7 +180,7 @@ "x": 9, "y": 68, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -193,7 +193,7 @@ "x": 8, "y": 104, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -206,7 +206,7 @@ "x": 11, "y": 95, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -219,7 +219,7 @@ "x": 12, "y": 96, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -232,7 +232,7 @@ "x": 10, "y": 95, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -245,7 +245,7 @@ "x": 9, "y": 105, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -258,7 +258,7 @@ "x": 15, "y": 75, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -271,7 +271,7 @@ "x": 9, "y": 84, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -284,7 +284,7 @@ "x": 15, "y": 74, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -297,7 +297,7 @@ "x": 15, "y": 73, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -310,7 +310,7 @@ "x": 18, "y": 111, "elevation": 4, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -323,7 +323,7 @@ "x": 10, "y": 86, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -336,7 +336,7 @@ "x": 9, "y": 110, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -349,7 +349,7 @@ "x": 18, "y": 112, "elevation": 4, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -362,7 +362,7 @@ "x": 15, "y": 70, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -375,7 +375,7 @@ "x": 17, "y": 103, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -388,7 +388,7 @@ "x": 18, "y": 114, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 97c4318c3..32531ae9c 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 15, "y": 11, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 20, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 10, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 11, "y": 20, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 85352beb1..2328175c2 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index a74cbc00a..13ed2a385 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2d5c09ac0..46ddb26a6 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -24,7 +24,7 @@ "x": 8, "y": 11, "elevation": 1, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 13, "y": 20, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 1d65c1c3f..543751968 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -29,7 +29,7 @@ "x": 3, "y": 10, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 4, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 13, "y": 17, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 6, "movement_range_y": 2, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 10, "y": 8, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index d53da31c1..51c7404ea 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 54b41dbf8..e9e2158f4 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 3aefa7fa2..cda4b6407 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 10, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 4, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 9, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 10, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 4, "y": 1, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 5, "y": 1, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index dbf624f2a..c8ecf0a16 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -29,7 +29,7 @@ "x": 6, "y": 15, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 33, "y": 17, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 21, "y": 28, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 33, "y": 27, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 42, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 30, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 46, "y": 20, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index adc0b397b..6c488ebea 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 7, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 4478ca348..435ac6917 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 677ae5cc0..90b0c0241 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 275478428..7d4a44390 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index aef59195d..e4f450c81 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -18,7 +18,7 @@ "x": 16, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 21, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 22, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 26, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 26, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 12d797fe6..32eebc0dc 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 9, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 0, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 15, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 16, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 683805b3c..4c223fd38 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 13, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 10, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index b5017653f..35c9e0f0e 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 357aef9a4..064480ba0 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 699130e5f..29e23f75c 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index ec8d5db18..e0e261c1e 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 15, "elevation": 0, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 03029ea74..3775d94cb 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index fe17526ee..3e9571b83 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index b5dd7cf45..6801df803 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 31b5155c4..2a450374f 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -18,7 +18,7 @@ "x": 22, "y": 24, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 29, "y": 32, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 22, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 27, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index e3d543e08..65704127b 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 36, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 18, "y": 23, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 35, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 07bcf2dc3..ddd72f291 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 13, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 22, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 9, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 32, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index e72ff2a96..049d0f739 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 20, "y": 25, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 34, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 23, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 29, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 5, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 88446bcf4..e61eac230 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -18,7 +18,7 @@ "x": 18, "y": 13, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 18, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 7, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 12, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index de6a03ac6..a5d1e6178 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -18,7 +18,7 @@ "x": 16, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 7, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index c71b75937..dc1304400 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 9, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 12, "y": 4, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 13, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 82088704a..73fec4fc6 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -18,7 +18,7 @@ "x": 17, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 4, "y": 12, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 12, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 11, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index ec66551ae..56cc9b30b 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 19, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 7, "y": 12, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 11, "y": 16, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 12, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 6, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 11, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index f03a04402..06fd7e03d 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -18,7 +18,7 @@ "x": 13, "y": 10, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 18, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 5, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 15, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 3d8a1a5be..f05d1f87c 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 10, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 13, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 8fb90e3c7..2114033a6 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 27, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 40, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 46, "y": 37, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 45, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 26, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 5, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 36, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 30, "y": 38, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 9dda49e24..8587ec56a 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 5, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 2c16ae2df..c365ad26e 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -18,7 +18,7 @@ "x": 26, "y": 28, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 39, "y": 27, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 45, "y": 24, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 20, "y": 17, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 5, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 27, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 37, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 33, "y": 22, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 22, "y": 22, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index d95126744..bbd3f59a7 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 5, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 11, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 36, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 41, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 23, "y": 23, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 15, "y": 33, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 29, "y": 35, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -122,7 +122,7 @@ "x": 2, "y": 29, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 2, "y": 37, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 9, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 1, "y": 20, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 1, "y": 22, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -187,7 +187,7 @@ "x": 4, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -200,7 +200,7 @@ "x": 2, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -213,7 +213,7 @@ "x": 39, "y": 26, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -226,7 +226,7 @@ "x": 42, "y": 26, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -239,7 +239,7 @@ "x": 43, "y": 28, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -252,7 +252,7 @@ "x": 45, "y": 30, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -265,7 +265,7 @@ "x": 45, "y": 33, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -278,7 +278,7 @@ "x": 25, "y": 1, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -291,7 +291,7 @@ "x": 27, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -304,7 +304,7 @@ "x": 23, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -317,7 +317,7 @@ "x": 26, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -330,7 +330,7 @@ "x": 24, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -343,7 +343,7 @@ "x": 27, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index b761f7d2d..586bf0f0d 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 9, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 24, "y": 12, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 6, "y": 32, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 10, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 21, "y": 27, "elevation": 3, - "movement_type": "16", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 5, "y": 16, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 1, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 63a051e5d..bdc600f55 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -18,7 +18,7 @@ "x": 20, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 15, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 0, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 7be2fae4f..be88faebf 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -18,7 +18,7 @@ "x": 19, "y": 9, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 2, "y": 20, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 12, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 19, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 14, "y": 24, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 06533ad54..1790720b4 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -18,7 +18,7 @@ "x": 19, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 20, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 19, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 16, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 4, "y": 14, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 6, "y": 23, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index e133094f3..8d636de9a 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -29,7 +29,7 @@ "x": 6, "y": 28, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 19, "y": 16, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 3, "trainer_type": 0, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index a0339bf58..fef96485a 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -29,7 +29,7 @@ "x": 7, "y": 60, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 4, "y": 62, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 15, "y": 70, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 4, "y": 68, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 13, "y": 44, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 9, "y": 27, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 10, "y": 20, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -120,7 +120,7 @@ "x": 10, "y": 22, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -133,7 +133,7 @@ "x": 10, "y": 24, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -146,7 +146,7 @@ "x": 10, "y": 26, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index ffa9b5483..dc1543ef0 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 2, "y": 3, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 31472bf81..41c497474 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 7882673d1..7cdaa105b 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -29,7 +29,7 @@ "x": 19, "y": 8, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 16, "y": 17, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 31, "y": 8, "elevation": 3, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 28, "y": 10, "elevation": 3, - "movement_type": "40", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 8, "movement_range_y": 4, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 38, "y": 15, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 50, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 42, "y": 8, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 50, "y": 14, "elevation": 3, - "movement_type": "25", + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 57, "y": 16, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 32, "y": 18, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 42, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 63, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -185,7 +185,7 @@ "x": 13, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 672ff606f..21d3b454f 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 10, "elevation": 0, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 86a3a8650..d7c8f1f5b 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 75c992abe..e6fcf63fc 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -34,7 +34,7 @@ "x": 17, "y": 32, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -47,7 +47,7 @@ "x": 9, "y": 40, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -60,7 +60,7 @@ "x": 16, "y": 47, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -73,7 +73,7 @@ "x": 13, "y": 59, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -86,7 +86,7 @@ "x": 14, "y": 70, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -99,7 +99,7 @@ "x": 13, "y": 92, "elevation": 3, - "movement_type": "37", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 4, "trainer_type": 1, @@ -112,7 +112,7 @@ "x": 10, "y": 99, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -125,7 +125,7 @@ "x": 18, "y": 108, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -138,7 +138,7 @@ "x": 11, "y": 100, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -151,7 +151,7 @@ "x": 18, "y": 36, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -164,7 +164,7 @@ "x": 9, "y": 101, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -177,7 +177,7 @@ "x": 19, "y": 64, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -190,7 +190,7 @@ "x": 19, "y": 63, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -203,7 +203,7 @@ "x": 12, "y": 111, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index bcb35b07f..fabd77a97 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 1f5ecbe0d..d06875648 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 57d619ddb..f2cf37890 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 8905899b1..2e9f47d52 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -29,7 +29,7 @@ "x": 62, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 63, "y": 12, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 54, "y": 11, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 42, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 43, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 35, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 29, "y": 11, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 9, "y": 14, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 16, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 14, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 44, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cb71cd411..cf88cbf8a 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -29,7 +29,7 @@ "x": 7, "y": 37, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 18, "y": 35, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 10, "y": 14, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 16, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 7, "y": 31, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 7, "y": 34, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 8, "y": 9, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 7, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 10, "y": 37, "elevation": 3, - "movement_type": "25", + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 6, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 18, "y": 47, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 7, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 12, "y": 35, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -185,7 +185,7 @@ "x": 1, "y": 47, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -198,7 +198,7 @@ "x": 13, "y": 51, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -211,7 +211,7 @@ "x": 12, "y": 51, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 19a33a867..12670bc16 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -29,7 +29,7 @@ "x": 22, "y": 13, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 31, "y": 12, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 37, "y": 14, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 44, "y": 13, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 50, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 59, "y": 12, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 63, "y": 13, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 52, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 4, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 54, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 28, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 4, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 20, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 39, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -185,7 +185,7 @@ "x": 40, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -198,7 +198,7 @@ "x": 73, "y": 7, "elevation": 13, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 32, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index af929b0e1..a9d8b8244 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 43a338c6c..8a4510422 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index fba9847f1..e51e64184 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -29,7 +29,7 @@ "x": 16, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 14, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 12, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 8, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 10, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 6, "y": 14, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 41, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -120,7 +120,7 @@ "x": 30, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 31, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 31, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 248a93f35..60c5f6598 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 0618f25fd..af13722a7 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 3d1f285c6..4dddd5b6d 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 6, "elevation": 0, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 4ec96dc6c..57006827d 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -29,7 +29,7 @@ "x": 4, "y": 18, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 6, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 11, "y": 15, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 15, "y": 24, "elevation": 3, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 4, "movement_range_y": 2, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 18, "y": 41, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 7, "y": 38, "elevation": 3, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 2, "y": 61, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 21, "y": 61, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 18, "y": 94, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 16, "y": 134, "elevation": 3, - "movement_type": "47", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 8, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 4, "y": 116, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, "trainer_type": 1, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 636acc2a7..5e89b3f8c 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -29,7 +29,7 @@ "x": 46, "y": 14, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 41, "y": 15, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 39, "y": 12, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 15d453cce..673241e1b 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 37094e443..1865cfa7f 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 3280d8588..308f98b54 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -29,7 +29,7 @@ "x": 15, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 6, "movement_range_y": 3, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 10, "y": 9, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 12, "y": 17, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 18, "y": 33, "elevation": 1, - "movement_type": "51", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 5, "movement_range_y": 3, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 8, "y": 27, "elevation": 1, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 16, "y": 22, "elevation": 1, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 11, "y": 47, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 14, "y": 48, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 12, "y": 49, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 9, "y": 48, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 8, "y": 41, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -172,7 +172,7 @@ "x": 9, "y": 41, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index d7cd6f16b..ac504faae 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -29,7 +29,7 @@ "x": 16, "y": 62, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 15, "y": 69, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 11, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 18, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 17, "y": 54, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 17, "y": 64, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 6, "y": 85, "elevation": 8, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 1, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 60b59fc66..3ce14e08d 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -29,7 +29,7 @@ "x": 8, "y": 11, "elevation": 1, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 16, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 34, "y": 7, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 43, "y": 9, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 23, "y": 10, "elevation": 1, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 4, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 73, "y": 16, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 111, "y": 9, "elevation": 1, - "movement_type": "45", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 5, "movement_range_y": 3, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 106, "y": 11, "elevation": 1, - "movement_type": "50", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 5, "movement_range_y": 3, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 93, "y": 10, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 54, "y": 11, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -159,7 +159,7 @@ "x": 69, "y": 3, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index ceda4c2db..2bc8bcad8 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -29,7 +29,7 @@ "x": 7, "y": 27, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 16, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 12, "y": 44, "elevation": 1, - "movement_type": "51", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 4, "movement_range_y": 2, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 14, "y": 35, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 15, "y": 35, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 13, "y": 65533, "elevation": 2, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 7a45953bf..90da7a10b 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -29,7 +29,7 @@ "x": 11, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 14, "y": 15, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 15, "y": 24, "elevation": 1, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 15, "y": 38, "elevation": 1, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 10, "y": 29, "elevation": 1, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 0772e9303..c6f903acc 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -29,7 +29,7 @@ "x": 25, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index ee3f73dcb..665477288 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 145e8cdd7..073a4a17c 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -29,7 +29,7 @@ "x": 15, "y": 149, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 8, "y": 140, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 14, "y": 123, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 16, "y": 112, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 10, "y": 94, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 14, "y": 61, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 6, "y": 35, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 56edad166..d87b68895 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -29,7 +29,7 @@ "x": 12, "y": 15, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 12, "y": 19, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 10, "y": 22, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 12, "y": 25, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 10, "y": 28, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 12, "y": 31, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 5, "y": 21, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 11, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c3f1520d5..d49d76361 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -24,7 +24,7 @@ "x": 11, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 18, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 17, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 22, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 22, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 27, "y": 9, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 28, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -115,7 +115,7 @@ "x": 36, "y": 4, "elevation": 3, - "movement_type": "26", + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, "trainer_type": 1, @@ -128,7 +128,7 @@ "x": 42, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -141,7 +141,7 @@ "x": 26, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -154,7 +154,7 @@ "x": 30, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -167,7 +167,7 @@ "x": 49, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -180,7 +180,7 @@ "x": 49, "y": 11, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index d08181f06..01cf8021f 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 708a8f5a8..2367b0b91 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 3, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index a04e5c546..4c4b7e790 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 37c58ebbd..1d73befbd 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 841360fe0..8d85f8f46 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 0def5e68f..f2ad40c5e 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -29,7 +29,7 @@ "x": 70, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 40, "y": 11, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 32, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 30, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 25, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 29, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 19, "y": 9, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 12, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 17, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 1e1dba0c7..b992a7d89 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -29,7 +29,7 @@ "x": 9, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 75, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 67, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 15, "y": 14, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 47, "y": 3, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 50, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 109, "y": 3, "elevation": 12, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index c9216ca84..29c7c514c 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 14, "y": 4, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 12, "y": 6, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index f602e0e25..e53504770 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 99f47dba4..11c53b635 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index f34ea88bf..a85de2522 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index c0e0968bb..f67590481 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -29,7 +29,7 @@ "x": 3, "y": 16, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 12, "y": 21, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 13, "y": 21, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 20, "y": 25, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 13, "y": 32, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 13, "y": 33, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 3ffcf414a..8b49e226d 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 76d9ab07c..e30bc8149 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -29,7 +29,7 @@ "x": 65528, "y": 12, "elevation": 10, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 6, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index e08a364f1..8bd0e7498 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index b1ff3747a..7ed8e635d 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -29,7 +29,7 @@ "x": 62, "y": 14, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 55, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 51, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 29, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 29, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 29, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 29, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 21, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 33, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -159,7 +159,7 @@ "x": 47, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 40, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -185,7 +185,7 @@ "x": 41, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -198,7 +198,7 @@ "x": 14, "y": 16, "elevation": 3, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, "trainer_type": 1, @@ -211,7 +211,7 @@ "x": 24, "y": 17, "elevation": 3, - "movement_type": "41", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT", "movement_range_x": 5, "movement_range_y": 5, "trainer_type": 1, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 02365a2b4..eb6b26e0f 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index c130136b9..24e5c3c4f 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -29,7 +29,7 @@ "x": 14, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 20, "y": 17, "elevation": 3, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 61, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 26, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 26, "y": 1, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 49, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 53, "y": 2, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 60, "y": 9, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 36, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -146,7 +146,7 @@ "x": 2, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -159,7 +159,7 @@ "x": 12, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 65, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index ba206ecd0..bf4c1e004 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -18,7 +18,7 @@ "x": 18, "y": 8, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 18ef8fc04..e8547d2e3 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 05b54f33b..db08152f0 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 0, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index e5c78e2b6..71febbbf9 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "52", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 2, "movement_range_y": 3, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 0, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 8011082b6..a97e88fcc 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 92f493357..7d3c24e5b 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 0d7dbf323..881554a8d 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index d5ca318a5..887022650 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 3, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 32aa20766..850b63fc4 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -18,7 +18,7 @@ "x": 30, "y": 2, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 7, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 06830f6cc..eacfe5c91 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 6875842e4..e01f65eb5 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 1, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 3, "y": 3, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index ee86853c8..7cc2af8e7 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 422d02458..9b15b4707 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -18,7 +18,7 @@ "x": 0, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 0583bd2a1..87a4b8adc 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index b1a3c0f8f..8e79519a0 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 8933f6f60..78aa22911 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index a82071d9e..a5fa829d4 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 629043f6f..462ce7098 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 0d4141a48..78786691b 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 1, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 32f9351fb..ff6030afb 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 835107344..8896c897f 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 2, "y": 2, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index b8f968c32..8ec955624 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 2ac95ca72..43fcf5c4d 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -18,7 +18,7 @@ "x": 12, "y": 10, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 14, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 13, "y": 13, "elevation": 3, - "movement_type": "27", + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 9, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 7be9b5fb5..12c466510 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -18,7 +18,7 @@ "x": 30, "y": 16, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index cb062a8fd..25cc15fad 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -18,7 +18,7 @@ "x": 1, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 4, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 8, "y": 9, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 14, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 14, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 14, "y": 9, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 1, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 3a1d5491f..78ea6e719 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 856b8b647..a8108ab01 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index 0dca9cb75..5693b1873 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 11, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index 2ca3a9a4f..6d994ad60 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 0, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 5e592724f..f9bdc0137 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -18,7 +18,7 @@ "x": 24, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 59e9da99c..50ac526b7 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -18,7 +18,7 @@ "x": 13, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 37, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 31, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 36, "y": 17, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index df7ce163a..6d6d2c272 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -18,7 +18,7 @@ "x": 33, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 28, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 29, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 806455000..298188e1b 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 02c576e4b..cf4eee158 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -18,7 +18,7 @@ "x": 28, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 17, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 16, "y": 27, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 27, "y": 24, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index cec8e2fca..9ca5a540e 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -40,7 +40,7 @@ "x": 22, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -53,7 +53,7 @@ "x": 26, "y": 16, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -66,7 +66,7 @@ "x": 46, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -79,7 +79,7 @@ "x": 27, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -92,7 +92,7 @@ "x": 25, "y": 33, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 7, "movement_range_y": 1, "trainer_type": 0, @@ -105,7 +105,7 @@ "x": 34, "y": 31, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -118,7 +118,7 @@ "x": 30, "y": 39, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, "trainer_type": 0, @@ -131,7 +131,7 @@ "x": 48, "y": 24, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -144,7 +144,7 @@ "x": 37, "y": 32, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -157,7 +157,7 @@ "x": 21, "y": 23, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -170,7 +170,7 @@ "x": 39, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -183,7 +183,7 @@ "x": 44, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -196,7 +196,7 @@ "x": 45, "y": 22, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -209,7 +209,7 @@ "x": 32, "y": 39, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, "trainer_type": 0, @@ -222,7 +222,7 @@ "x": 47, "y": 24, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index a0137ad22..d6e1d9d4d 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -18,7 +18,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 1, "y": 10, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 11, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 1, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 5, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 7, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 407084933..cfbf00b36 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 24, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 24, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 14, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 4, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 4, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 14, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 24, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -122,7 +122,7 @@ "x": 15, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index a6e09da5c..4f7e0a241 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 3, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index 279ebff20..e7484dfae 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 8f61b1054..41fb0d809 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -18,7 +18,7 @@ "x": 0, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 4, "elevation": 0, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index 858646db5..3d3e7410e 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 8e4b9ce60..8f3bd6718 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index a10d91a62..bb78415b4 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index b6ae61450..62b084caf 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 9bb75dc81..979278cdb 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 3, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 3, "y": 12, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 9, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 12, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 9, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 5, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 49986cd0f..9006cac0a 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -18,7 +18,7 @@ "x": 22, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 66, @@ -31,7 +31,7 @@ "x": 32, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 67, @@ -44,7 +44,7 @@ "x": 11, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 1444996be..ed0f29ae1 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -18,7 +18,7 @@ "x": 22, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 68, @@ -31,7 +31,7 @@ "x": 30, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 69, @@ -44,7 +44,7 @@ "x": 19, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 24, "y": 14, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index b24e1ae17..3e6f5f257 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -18,7 +18,7 @@ "x": 22, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 70, @@ -31,7 +31,7 @@ "x": 30, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 71, @@ -44,7 +44,7 @@ "x": 18, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 6201fb5ea..e5c9cc7d1 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -18,7 +18,7 @@ "x": 23, "y": 8, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 24, "y": 8, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 12, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 77, @@ -57,7 +57,7 @@ "x": 13, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 9, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 6, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 76, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 08001aa58..5fc46fdee 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 18, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 9, "y": 18, "elevation": 1, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 2, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 22, "y": 19, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 9f7d5692c..8eab1efa3 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -29,7 +29,7 @@ "x": 7, "y": 18, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 15, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 1e86aa88b..aad741634 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 822cc960a..690fa63d8 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 219481590..678716dcc 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 5, "elevation": 0, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 715183f88..b505a4a93 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "16", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 5, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index dc68e4013..e620814b4 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 14, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index c44ce8385..0d08ea5d1 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 50884dd2a..ccd0c8ddd 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -29,7 +29,7 @@ "x": 13, "y": 43, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 13, "y": 36, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 3, "y": 35, "elevation": 3, - "movement_type": "21", + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 3, "y": 36, "elevation": 3, - "movement_type": "22", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 7, "y": 56, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 11, "y": 63, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 14, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -120,7 +120,7 @@ "x": 14, "y": 14, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -133,7 +133,7 @@ "x": 3, "y": 41, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -146,7 +146,7 @@ "x": 13, "y": 47, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -159,7 +159,7 @@ "x": 7, "y": 44, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 12, "y": 47, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -185,7 +185,7 @@ "x": 15, "y": 46, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -198,7 +198,7 @@ "x": 16, "y": 47, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -211,7 +211,7 @@ "x": 17, "y": 47, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -224,7 +224,7 @@ "x": 11, "y": 31, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -237,7 +237,7 @@ "x": 18, "y": 45, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -250,7 +250,7 @@ "x": 7, "y": 38, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -263,7 +263,7 @@ "x": 17, "y": 23, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -276,7 +276,7 @@ "x": 8, "y": 26, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index d0ad8bc08..0bf40fca3 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -29,7 +29,7 @@ "x": 12, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -42,7 +42,7 @@ "x": 3, "y": 34, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -55,7 +55,7 @@ "x": 4, "y": 34, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -68,7 +68,7 @@ "x": 11, "y": 26, "elevation": 3, - "movement_type": "20", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -81,7 +81,7 @@ "x": 10, "y": 26, "elevation": 3, - "movement_type": "19", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -94,7 +94,7 @@ "x": 11, "y": 17, "elevation": 5, - "movement_type": "23", + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -107,7 +107,7 @@ "x": 7, "y": 65534, "elevation": 1, - "movement_type": "0", + "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 17, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 3803d3200..864ce7c59 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 4, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index cbb2f2b76..b768509fb 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 8, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 8, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 6, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 619d30729..42c643af5 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -24,7 +24,7 @@ "x": 35, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 121, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 85, "y": 8, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 85, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 9973bc923..47fb5fa98 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -24,7 +24,7 @@ "x": 56, "y": 26, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 56, "y": 29, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index ef0339b63..924dbbcba 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index fe3329368..6d0fbaa4c 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index b241536b6..780878898 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index d32447db2..d4a021ff3 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index f9d032e87..1ee41e1b4 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 4ec4b1e45..abaab80d6 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 4e28edf5b..827c6c9ca 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index 4e8fb9db3..ed9ba908f 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 10, "y": 16, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 11, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index e4bbd291f..3f553ce47 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 14, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 11, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 12, "y": 13, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index cff922886..ee3dbe4c0 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index da9f835e2..7d71b3b26 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 10, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 0, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 5, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 2, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 3, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index ec99fdfe9..89a1a8bf3 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 11, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 16, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 16, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 2, "y": 19, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 06a5b7ac0..277329dfc 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 4529535b2..fed3b8390 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -18,7 +18,7 @@ "x": 29, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 28, "y": 18, "elevation": 3, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 20, "y": 14, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 5, "y": 19, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 10, "y": 4, "elevation": 0, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 3f7e3590b..8a81b5118 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -18,7 +18,7 @@ "x": 25, "y": 9, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 31, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 12, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 8, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 6390f880b..fc37a6102 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -18,7 +18,7 @@ "x": 33, "y": 16, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 10, "y": 19, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 14, "y": 8, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 3, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 4, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 2, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 30, "y": 18, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index be2d202e8..9bc1989ff 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -18,7 +18,7 @@ "x": 35, "y": 7, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 23, "y": 13, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 16, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 11, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 9, "y": 21, "elevation": 3, - "movement_type": "16", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 4, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 1, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 22, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 2, "y": 7, "elevation": 3, - "movement_type": "28", + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index d1a65f4f3..a1142c5ed 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -18,7 +18,7 @@ "x": 21, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 23, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 24, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 22, "y": 13, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 14, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 16, "y": 12, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 9, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 2, "y": 14, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 1, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 18, "y": 17, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index b0f6a8e12..87a1a413c 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 0, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 24, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 24, "y": 15, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 13, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 13, "y": 14, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 9, "y": 14, "elevation": 3, - "movement_type": "27", + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 3, "y": 13, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -135,7 +135,7 @@ "x": 0, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 30, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index aba6cfb3f..ef04548df 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -18,7 +18,7 @@ "x": 28, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 10, "y": 17, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 24, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 29, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 722ca91e7..e8f39eba5 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -18,7 +18,7 @@ "x": 26, "y": 16, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 15, "y": 18, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 2, "y": 16, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 86eb5ca6d..9df09bc51 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -24,7 +24,7 @@ "x": 10, "y": 15, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 15, "y": 13, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 6d0b3c957..e3cce0b89 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 7, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 57be8be4a..40ddb539d 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -29,7 +29,7 @@ "x": 11, "y": 8, "elevation": 3, - "movement_type": "20", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index be77bd7eb..8b6059fb2 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 026d381e1..ec39e8197 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 988fddd5f..54f2ec17c 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 7, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index bc785bd6b..e8a0aff0b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -24,7 +24,7 @@ "x": 9, "y": 24, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 12, "y": 15, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 13, "y": 34, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 14, "y": 61, "elevation": 1, - "movement_type": "50", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 2, "movement_range_y": 4, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 10, "y": 44, "elevation": 1, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 11, "y": 44, "elevation": 1, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 11, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 733c0c958..ada89bce9 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -18,7 +18,7 @@ "x": 48, "y": 15, "elevation": 3, - "movement_type": "20", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 10, "y": 5, "elevation": 3, - "movement_type": "18", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 51, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 12, "y": 13, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 37, "y": 23, "elevation": 3, - "movement_type": "51", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 2, "movement_range_y": 5, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 32, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 52, "y": 20, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 8, "y": 21, "elevation": 3, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -122,7 +122,7 @@ "x": 39, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -135,7 +135,7 @@ "x": 3, "y": 9, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 1, @@ -148,7 +148,7 @@ "x": 19, "y": 24, "elevation": 3, - "movement_type": "28", + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "movement_range_y": 1, "trainer_type": 1, @@ -161,7 +161,7 @@ "x": 30, "y": 19, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 2f3c4b610..f3154e3fc 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 5, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 13, "y": 3, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 9966343f0..f8088db9a 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 26f0ccdf5..5e35f5a91 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -24,7 +24,7 @@ "x": 24, "y": 25, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 32, "y": 11, "elevation": 5, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 33, "y": 16, "elevation": 5, - "movement_type": "14", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 31, "y": 24, "elevation": 5, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 14, "y": 10, "elevation": 5, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 21, "y": 29, "elevation": 5, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 3, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 17, "y": 10, "elevation": 5, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -115,7 +115,7 @@ "x": 17, "y": 12, "elevation": 5, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -128,7 +128,7 @@ "x": 18, "y": 11, "elevation": 5, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -141,7 +141,7 @@ "x": 6, "y": 33, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -154,7 +154,7 @@ "x": 6, "y": 34, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -167,7 +167,7 @@ "x": 41, "y": 32, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -180,7 +180,7 @@ "x": 41, "y": 33, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -193,7 +193,7 @@ "x": 42, "y": 33, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -206,7 +206,7 @@ "x": 5, "y": 33, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -219,7 +219,7 @@ "x": 19, "y": 11, "elevation": 5, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -232,7 +232,7 @@ "x": 43, "y": 32, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 5a0f111c8..edd2ac240 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -34,7 +34,7 @@ "x": 12, "y": 13, "elevation": 3, - "movement_type": "19", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -47,7 +47,7 @@ "x": 11, "y": 52, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -60,7 +60,7 @@ "x": 13, "y": 35, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -73,7 +73,7 @@ "x": 15, "y": 45, "elevation": 1, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -86,7 +86,7 @@ "x": 6, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -99,7 +99,7 @@ "x": 7, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -112,7 +112,7 @@ "x": 11, "y": 76, "elevation": 3, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -125,7 +125,7 @@ "x": 17, "y": 19, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -138,7 +138,7 @@ "x": 17, "y": 87, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 6cc57af62..1405f0707 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index cf4c1dad2..91221239f 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "15", + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 9607ba491..2e758df5e 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -29,7 +29,7 @@ "x": 7, "y": 24, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 8, "y": 23, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 8, "y": 24, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 9, "y": 23, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 9, "y": 24, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 10, "y": 22, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 10, "y": 24, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -120,7 +120,7 @@ "x": 11, "y": 23, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -133,7 +133,7 @@ "x": 20, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -146,7 +146,7 @@ "x": 18, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -159,7 +159,7 @@ "x": 15, "y": 7, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -172,7 +172,7 @@ "x": 14, "y": 14, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -185,7 +185,7 @@ "x": 15, "y": 14, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -198,7 +198,7 @@ "x": 15, "y": 31, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 502289c81..f6dd0d71c 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 19, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 23, "y": 17, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 38, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 44, "y": 23, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 44, "y": 29, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 16, "y": 43, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 17, "y": 39, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 14, "y": 39, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 11, "y": 39, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 27, "y": 11, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -187,7 +187,7 @@ "x": 12, "y": 43, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 71dbfd64d..993732967 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -24,7 +24,7 @@ "x": 27, "y": 10, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -37,7 +37,7 @@ "x": 68, "y": 10, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -50,7 +50,7 @@ "x": 33, "y": 13, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -63,7 +63,7 @@ "x": 50, "y": 11, "elevation": 3, - "movement_type": "27", + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 1, @@ -76,7 +76,7 @@ "x": 36, "y": 4, "elevation": 1, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -89,7 +89,7 @@ "x": 77, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -102,7 +102,7 @@ "x": 78, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -115,7 +115,7 @@ "x": 72, "y": 8, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -128,7 +128,7 @@ "x": 86, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 18fddbfc1..22ddfed8b 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -18,7 +18,7 @@ "x": 23, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index b11ac06db..e609a4011 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index a8aa72fdf..dfe2a6c9a 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 4, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index f692de547..41d291f8e 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 65e391a96..b4adfbb86 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 1933aab5e..dfd8bb1d9 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 2a9a5665a..2e50fa9da 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index c7db3c25c..6d66f0fe2 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 7, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 7a6688bc6..ede9d59ab 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 3, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 7ee8e0316..84cea2d4f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index e7adfec0b..47aff8ea7 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -24,7 +24,7 @@ "x": 14, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 8, "y": 8, "elevation": 3, - "movement_type": "28", + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 1, "trainer_type": 0, @@ -50,7 +50,7 @@ "x": 13, "y": 10, "elevation": 3, - "movement_type": "49", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 71310c57f..2ffdfab5c 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -18,7 +18,7 @@ "x": 9, "y": 6, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 34f5bbfce..556aa49da 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -24,7 +24,7 @@ "x": 28, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -37,7 +37,7 @@ "x": 31, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -50,7 +50,7 @@ "x": 30, "y": 11, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -63,7 +63,7 @@ "x": 26, "y": 5, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -76,7 +76,7 @@ "x": 27, "y": 6, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -89,7 +89,7 @@ "x": 30, "y": 16, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -102,7 +102,7 @@ "x": 39, "y": 16, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -115,7 +115,7 @@ "x": 37, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -128,7 +128,7 @@ "x": 24, "y": 12, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 9d13a0086..71a48a62b 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 6d992c355..e4a7a2084 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -18,7 +18,7 @@ "x": 8, "y": 9, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 8, "y": 6, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 684033ce5..83f302e66 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index bb927734e..21435179e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 5, "elevation": 1, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 5, "y": 8, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 5, "elevation": 1, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 4d3db31f6..d8abc60f9 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 11, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index ba3815e00..86ef55e25 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 8ad44f032..3e600d6ad 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 93aa45550..18939c721 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index fd06be101..e58624d4e 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index bc4e4f4aa..ab685cca5 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 05afe6e01..91cf2cb49 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -18,7 +18,7 @@ "x": 3, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 1, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 13, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 10, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 13, "y": 8, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 7398ea10b..e4286aa87 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -29,7 +29,7 @@ "x": 22, "y": 11, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -42,7 +42,7 @@ "x": 17, "y": 9, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -55,7 +55,7 @@ "x": 36, "y": 10, "elevation": 0, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -68,7 +68,7 @@ "x": 35, "y": 11, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, "trainer_type": 0, @@ -81,7 +81,7 @@ "x": 31, "y": 30, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, @@ -94,7 +94,7 @@ "x": 24, "y": 33, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -107,7 +107,7 @@ "x": 19, "y": 24, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -120,7 +120,7 @@ "x": 25, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 128b723d6..8ed2603da 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 11, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 8, "y": 13, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 4, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 7, "y": 8, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index b712f5c9f..7eec8c8e8 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 547e72ba9..a503a2aa6 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -18,7 +18,7 @@ "x": 4, "y": 4, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index aa5247c5d..2f715b1e3 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 4, "elevation": 0, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 754b3c81b..e2aaee125 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 2, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 4, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index b5b5467c8..70b50d7fe 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 8, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 14, "y": 4, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 6, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 2, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 3, "y": 1, "elevation": 0, - "movement_type": "76", + "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 4a9190f0f..ff7c1be19 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 761fac2ab..c9f0c45ed 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 4, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 4, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 7, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 4, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 4, "y": 5, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 7, "y": 5, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 906c2a3d7..03b6b0cdd 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -18,7 +18,7 @@ "x": 5, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 14, "y": 6, "elevation": 4, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 12, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 14, "y": 1, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -70,7 +70,7 @@ "x": 7, "y": 18, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 4, "y": 12, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 16, "y": 3, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 454659d7e..bb44ea7d0 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 20, "y": 11, "elevation": 4, - "movement_type": "17", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 31, "y": 16, "elevation": 4, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 26, "y": 6, "elevation": 3, - "movement_type": "40", + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 4, "movement_range_y": 4, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 36, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 17, "y": 6, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 40, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 25, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 14, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 8, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 6, "y": 17, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -161,7 +161,7 @@ "x": 33, "y": 19, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -174,7 +174,7 @@ "x": 40, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index f98654fe8..9d2b982a9 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -18,7 +18,7 @@ "x": 40, "y": 7, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 21, "y": 5, "elevation": 4, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 10, "y": 17, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 11, "y": 16, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 38, "y": 7, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -83,7 +83,7 @@ "x": 12, "y": 9, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 19, "y": 15, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 33, "y": 18, "elevation": 0, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 88, @@ -122,7 +122,7 @@ "x": 35, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -135,7 +135,7 @@ "x": 32, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -148,7 +148,7 @@ "x": 38, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -161,7 +161,7 @@ "x": 39, "y": 13, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index b984008d5..ca30e0c6e 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -34,7 +34,7 @@ "x": 8, "y": 26, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -47,7 +47,7 @@ "x": 11, "y": 24, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -60,7 +60,7 @@ "x": 34, "y": 11, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -73,7 +73,7 @@ "x": 21, "y": 6, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 2, "movement_range_y": 3, "trainer_type": 0, @@ -86,7 +86,7 @@ "x": 20, "y": 12, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 3, "trainer_type": 0, @@ -99,7 +99,7 @@ "x": 33, "y": 26, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, "trainer_type": 0, @@ -112,7 +112,7 @@ "x": 16, "y": 22, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -125,7 +125,7 @@ "x": 18, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -138,7 +138,7 @@ "x": 17, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 1361dfb46..0297a31b1 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -18,7 +18,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -31,7 +31,7 @@ "x": 12, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -44,7 +44,7 @@ "x": 11, "y": 14, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 10, "y": 10, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 2, "y": 21, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 3, "y": 11, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -96,7 +96,7 @@ "x": 6, "y": 8, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -109,7 +109,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 13, "y": 7, "elevation": 3, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -135,7 +135,7 @@ "x": 16, "y": 20, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 668ae37da..1a960169e 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 4, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 6, "y": 6, "elevation": 3, - "movement_type": "5", + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 0f027934d..5190a5d28 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 4, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index e4761721c..09f58a9d5 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -18,7 +18,7 @@ "x": 2, "y": 3, "elevation": 0, - "movement_type": "10", + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 9, "y": 5, "elevation": 3, - "movement_type": "3", + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 6dbd242bb..3e5822608 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -18,7 +18,7 @@ "x": 7, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 12, "y": 5, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 4, "y": 7, "elevation": 3, - "movement_type": "1", + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 2, "y": 3, "elevation": 3, - "movement_type": "2", + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index c46d275cf..a552725f9 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -18,7 +18,7 @@ "x": 6, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 2, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 10, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, "trainer_type": 0, @@ -57,7 +57,7 @@ "x": 1, "y": 2, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 8dbe5c5a5..90f689a9f 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -18,7 +18,7 @@ "x": 29, "y": 58, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -31,7 +31,7 @@ "x": 45, "y": 58, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -44,7 +44,7 @@ "x": 47, "y": 45, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -57,7 +57,7 @@ "x": 47, "y": 29, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -70,7 +70,7 @@ "x": 7, "y": 22, "elevation": 3, - "movement_type": "9", + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -83,7 +83,7 @@ "x": 5, "y": 41, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -96,7 +96,7 @@ "x": 40, "y": 21, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -109,7 +109,7 @@ "x": 21, "y": 34, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, @@ -122,7 +122,7 @@ "x": 43, "y": 6, "elevation": 3, - "movement_type": "13", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -135,7 +135,7 @@ "x": 16, "y": 5, "elevation": 3, - "movement_type": "7", + "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 1, @@ -148,7 +148,7 @@ "x": 49, "y": 60, "elevation": 3, - "movement_type": "8", + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, "trainer_type": 0, |