diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-27 10:32:39 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-04-28 19:59:16 -0500 |
| commit | 4dabc1bc7b211f3b4edceddc65d20b05b78667e5 (patch) | |
| tree | cdd0d8ca845060eda6cb4a731c45cd3b13a5f9f7 | |
| parent | 0459f99a95dc3c8f15749b30e20b8a9bbceef41b (diff) | |
Use trainer type constants
342 files changed, 2105 insertions, 2096 deletions
diff --git a/data/map_events.s b/data/map_events.s index bd9ac9c99..faa37d65c 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -5,6 +5,7 @@ #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/secret_bases.h" +#include "constants/trainer_types.h" #include "constants/vars.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index b1c4086c0..9a504ae6d 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_15EAF5", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_1B18BE", "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1" diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index c65a79fdc..637081cd8 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_1F_EventScript_15E965", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 7, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Corridors_1F_EventScript_15E96E", "flag": "0" diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 7c100a73e..edc74fe01 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_B1F_EventScript_15E9CA", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Corridors_B1F_EventScript_15EA1E", "flag": "0" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 243d83bdf..3c4865d81 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18CB", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18D8", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18F2", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18E5", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3" diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index abbe32342..1b8dd19f1 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Room_B1F_EventScript_1B18A4", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1" diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 1d9d75c42..e861d2c04 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_1F_EventScript_15EA68", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_1F_EventScript_15EAAE", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_1F_EventScript_1B18B1", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index ce39a1b79..c6429948f 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_15EA4E", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_1B1897", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1" diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index e78ef41b1..45c54b174 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_15E986", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_1B187D", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1" diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 5ae694e61..6955c5c91 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_15EA44", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_1B188A", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1" diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index c9286da84..387c32246 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AncientTomb_EventScript_15F050", "flag": "FLAG_HIDE_REGISTEEL" diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index d9fac11ab..4077c76c8 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_15D7CE", "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_15D7ED", "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 13, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_1F_EventScript_15D80C", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index a5a26ae9b..a18fe6bb8 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_B1F_EventScript_15D850", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B1F_EventScript_15D875", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_1B19A8", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_15D89A", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_1B198E", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_2" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_1A04FD", "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_1B199B", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_3" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_1A051B", "flag": "FLAG_HIDE_ELECTRODE_2_HIDEOUT" diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index 11dcc1a40..c6f99621b 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_15D8E1", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_B2F_EventScript_15D962", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_1B19B5", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B2F_EventScript_15D987", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" diff --git a/data/maps/BattleTower_BattleRoom/map.json b/data/maps/BattleTower_BattleRoom/map.json index 848b03946..62691f593 100644 --- a/data/maps/BattleTower_BattleRoom/map.json +++ b/data/maps/BattleTower_BattleRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/BattleTower_Corridor/map.json b/data/maps/BattleTower_Corridor/map.json index eec8217c8..1aa666b00 100644 --- a/data/maps/BattleTower_Corridor/map.json +++ b/data/maps/BattleTower_Corridor/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/BattleTower_Elevator/map.json b/data/maps/BattleTower_Elevator/map.json index 43e78ec05..ab9f83cb5 100644 --- a/data/maps/BattleTower_Elevator/map.json +++ b/data/maps/BattleTower_Elevator/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/BattleTower_Lobby/map.json b/data/maps/BattleTower_Lobby/map.json index 8b630bfdd..81f983a84 100644 --- a/data/maps/BattleTower_Lobby/map.json +++ b/data/maps/BattleTower_Lobby/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_16049E", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_1606A5", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_160715", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_16071E", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_1AE1FF", "flag": "FLAG_HIDE_REPORTER_BATTLE_TOWER" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Lobby_EventScript_160733", "flag": "FLAG_HIDE_AWARD_MAN_BATTLE_TOWER" diff --git a/data/maps/BattleTower_Outside/map.json b/data/maps/BattleTower_Outside/map.json index 761dc2a10..d0e4d04f9 100644 --- a/data/maps/BattleTower_Outside/map.json +++ b/data/maps/BattleTower_Outside/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Outside_EventScript_160263", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Outside_EventScript_16026C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Outside_EventScript_160275", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleTower_Outside_EventScript_160168", "flag": "0" diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index 8dce96798..e0b2c8c5c 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CaveOfOrigin_B3F_EventScript_1B1A44", "flag": "FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1" diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 8ab4aa087..43e765b0b 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN" diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 6e8529525..d545443f8 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DesertRuins_EventScript_15CB85", "flag": "FLAG_HIDE_REGIROCK" diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 9fe0e921d..b6291d287 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_14E0A2", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_EventScript_14E002", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_14E0C6", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_14E413", "flag": "0" diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index eec89848c..f440d1a5c 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_153152", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1531D9", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1531FB", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "DewfordTown_Gym_EventScript_15321D", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_15323F", "flag": "0" diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index ff4fa0065..ee688c9c3 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_153293", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1532BC", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1532CD", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_15330A", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_153326", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_153342", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1533F2", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1533FE", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_15359D", "flag": "FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL" diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index d4774d408..48d1a10dd 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_152FF8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_152FEF", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_153001", "flag": "0" diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 87ab4a86b..ec2145201 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_1535DC", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_15361F", "flag": "0" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index bf90976b0..e1cacefb1 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_153023", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_153031", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_15303A", "flag": "0" diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 67ce247cc..061d5228e 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_153053", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_153059", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_15305F", "flag": "0" diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 67025f33f..fb425c537 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_CHAMPIONS_ROOM" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BIRCH_CHAMPIONS_ROOM" diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index c027a16f6..719451beb 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_DrakesRoom_EventScript_15B764", "flag": "0" diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 286bfdd39..7938c77d2 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_GlaciasRoom_EventScript_15B6CA", "flag": "0" diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index 297d66426..d35d5c2d9 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 36a42757d..c65c87385 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PhoebesRoom_EventScript_15B630", "flag": "0" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 2de6531f9..2ac4d15b9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC70", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC87", "flag": "0" diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index dca22233b..7266578b8 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC", "flag": "0" diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index 0a74924fc..7583323bc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_EventScript_15BA9A", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_EventScript_15BAA8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_EventScript_15BAD2", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_EventScript_15BAD2", "flag": "0" diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 72ff929f6..733266cfa 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_SidneysRoom_EventScript_15B596", "flag": "0" diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 0d37b1514..7ad3e4f1f 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_14E814", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_14E7F5", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_14E81D", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_14E826", "flag": "FLAG_HIDE_AZURILL_FALLARBOR" diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 40294eafb..b87d95542 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestHall_EventScript_153ACF", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestHall_EventScript_153AD8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestHall_EventScript_153AE1", "flag": "0" diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index d814c1b3c..770a14a65 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_1539CD", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_153A8E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_153AB2", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_1B778A", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_1AE0B6", "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_ContestLobby_EventScript_153A97", "flag": "0" diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index 94a3ea653..e809610c8 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_153BB5", "flag": "FLAG_HIDE_PROF_COSMO_FALLARBOR" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_153C5E", "flag": "0" diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index b113df4ea..bd522be27 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House2_EventScript_153C91", "flag": "0" diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index a2ef49c03..e325134c4 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_153967", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_15399C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1539A5", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1539AE", "flag": "0" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 7642da9bb..ee1a96ba7 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_153B02", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_153B10", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_153B19", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_153B22", "flag": "FLAG_HIDE_LANETTE_FALLARBOR" diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 0279f1562..4dec245fe 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_153BA8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_153B9C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_153BA2", "flag": "0" diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 1af09e409..c02965a1d 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_1B17EE", "flag": "FLAG_ITEM_FIERY_PATH_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_15" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_1B17E1", "flag": "FLAG_ITEM_FIERY_PATH_2" diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 79177c4c6..b6047e395 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C955", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C97D", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C95E", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C98F", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C986", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C998", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_14C9B3", "flag": "FLAG_HIDE_KECLEON_FORTREE" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 9dcd666c3..896aa737e 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_158258", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_158261", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_15826A", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_158298", "flag": "0" diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index d2a9b517e..c967fd6c8 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_157EF0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_157F62", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_157F90", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "FortreeCity_Gym_EventScript_157FA7", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FortreeCity_Gym_EventScript_157F79", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_157FBE", "flag": "0" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index b1dfbf2d7..1043bec20 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_157E13", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_157EC0", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_157EB7", "flag": "0" diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 5f14237e1..47ccdfbb3 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House2_EventScript_1580B4", "flag": "0" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 3f23b0ada..85509eed4 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_15816C", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_158175", "flag": "0" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index a217711ba..c0256d8a4 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_15817F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_158188", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_15821E", "flag": "FLAG_HIDE_WINGULL_FORTREE_HOUSE" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 1b3535ddf..5324d59f2 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_158232", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_158244", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_15823B", "flag": "0" diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index 366dd8d69..ebf83b274 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_158067", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_158098", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_1580A1", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_1580AA", "flag": "0" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index c18237db4..e5ab2916d 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_15801B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_158029", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_158032", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_15803B", "flag": "0" diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 7a19eb100..169f5ac1c 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_158054", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_15805A", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_158060", "flag": "0" diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index be6ec6372..c19b0e793 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_15CBA7", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_1B17A0", "flag": "FLAG_ITEM_GRANITE_CAVE_1F_1" diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 65c55e08d..0d8e71457 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B1F_EventScript_1B17AD", "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_1" diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 5060b2f3b..fc4993edc 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_1B17BA", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_1B17C7", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_12" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_13" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_14" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_15" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_16" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_17" diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 28d6e9e8c..18ddac4b3 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_StevensRoom_EventScript_15CBFA", "flag": "FLAG_HIDE_STEVEN_GRANITE_CAVE" diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 23d0d9acc..2847ebb9c 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_15FC8B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_15FC8B", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_15FC8B", "flag": "0" diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 93fbe62c9..405f2699c 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IslandCave_EventScript_15EF9D", "flag": "FLAG_HIDE_REGICE" diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 562ba58ed..6076e813d 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_15D285", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "JaggedPass_EventScript_15D2DA", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "JaggedPass_EventScript_1B17D4", "flag": "FLAG_ITEM_JAGGED_PASS_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_15D29C", "flag": "0" diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 5f3efd98d..b6c53147b 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -25,7 +25,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E751", "flag": "0" @@ -38,7 +38,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E724", "flag": "0" @@ -51,7 +51,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E72D", "flag": "0" @@ -64,7 +64,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E736", "flag": "0" @@ -77,7 +77,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E73F", "flag": "0" @@ -90,7 +90,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E748", "flag": "0" @@ -103,7 +103,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_2" @@ -116,7 +116,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E575", "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_1" @@ -129,7 +129,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_14E75A", "flag": "0" diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 8abc65dc9..0f0a5a060 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_153741", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_153859", "flag": "0" diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 651ec648b..385573370 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_153629", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_153655", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_15364C", "flag": "0" diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 4035f889a..119f2f10f 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1538AE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1538B7", "flag": "0" diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 060d69e0c..a19b8bf95 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1538CB", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1538FA", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_153903", "flag": "0" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index b823fcabe..6f722df89 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_15391B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_153929", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_153932", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_15393B", "flag": "0" diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index ec48712c6..b6dbb1b47 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_153960", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_153954", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_15395A", "flag": "0" diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 678e72a1f..6d8d52000 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CBEF", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CBC7", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CBBE", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CBE6", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CC2D", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CC0E", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CC36", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CC3F", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CC48", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CCE5", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1B1738", "flag": "FLAG_ITEM_LILYCOVE_1" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CD3D", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CD22", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CD2B", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CD34", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CB74", "flag": "0" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_14CD46", "flag": "FLAG_HIDE_RIVAL_LILYCOVE_MART" diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index b77a43092..d0f411d54 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15909B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590A4", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590AD", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590BF", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590D4", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590E9", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590FE", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159113", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159128", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15913D", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159170", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159146", "flag": "0" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159185", "flag": "0" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15919A", "flag": "0" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1591AF", "flag": "0" @@ -214,7 +214,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1591C4", "flag": "0" @@ -227,7 +227,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1591D9", "flag": "0" @@ -240,7 +240,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1591EE", "flag": "0" @@ -253,7 +253,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159203", "flag": "0" @@ -266,7 +266,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15922D", "flag": "0" @@ -279,7 +279,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159218", "flag": "0" @@ -292,7 +292,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15915B", "flag": "0" @@ -305,7 +305,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159242", "flag": "0" @@ -318,7 +318,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159257", "flag": "0" @@ -331,7 +331,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_15926C", "flag": "0" @@ -344,7 +344,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159281", "flag": "0" @@ -357,7 +357,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_159296", "flag": "0" @@ -370,7 +370,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1592AB", "flag": "0" @@ -383,7 +383,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1592C0", "flag": "0" @@ -396,7 +396,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1592F7", "flag": "0" @@ -409,7 +409,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1592E2", "flag": "0" @@ -422,7 +422,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_1590B6", "flag": "0" diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index ec02f26f1..83697d1e8 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_158EB0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_158B85", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_1B77AB", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_15901E", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_159027", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_159042", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_1AE0B6", "flag": "FLAG_HIDE_CONTEST_REPORTER_LILYCOVE" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_15907B", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_159084", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ARTIST_LILCOVE_CONTEST" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_159054", "flag": "0" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_15904B", "flag": "0" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_15905D", "flag": "0" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index c7ef3cb00..4bcb4ab57 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5", "flag": "0" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 6d5093142..954635fbd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158400", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158412", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158409", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 9ea7fd933..4f3fd5189 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreElevator_EventScript_15A39C", "flag": "0" diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 0ec2ad64b..83412d697 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A167", "flag": "FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART" diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 1d88cb7ae..77d3eb262 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159D55", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159D5E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159ED7", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EE0", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EE9", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EF2", "flag": "0" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index fa87aaa80..503dc35c5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F0F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F18", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F21", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F5E", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F2A", "flag": "0" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index a8b94d162..49b978443 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FE2", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FEB", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FF4", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_159F91", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FB8", "flag": "0" diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 17aa1c20c..f6d7ea584 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_159FFE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A007", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A010", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A019", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A03C", "flag": "0" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 23da6139d..951ccadab 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A136", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A124", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A061", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A094", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A0C2", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A0F2", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A12D", "flag": "0" diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1c58a59a7..5b31c8129 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_1598A2", "flag": "FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_159A8D", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_FERRY_SAILOR_LILYCOVE" diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index efc66e267..f3e5f9062 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_159B86", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_159B8F", "flag": "0" diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 47d919218..37c25007d 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House2_EventScript_159BA3", "flag": "0" diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index ee0bd57b5..4c8b928e4 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159CE5", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159BF3", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159C7D", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159CB1", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159C49", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_159C32", "flag": "0" diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 7645f5564..874f8f6df 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_159D42", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_159D4B", "flag": "0" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 07ef68f64..4fd29b047 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15841C", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158425", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158558", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158561", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15856A", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158573", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15857C", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15858E", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158585", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 64b70f3d1..fc1a594d4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_158805", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15880E", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_158817", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 97b012072..1893cbd0d 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_MoveDeletersHouse_EventScript_159AAE", "flag": "0" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index cca7088ee..96bebc00d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_159331", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_15933F", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_159348", "flag": "0" diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 549fe96df..8d6ec1169 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_159377", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_15937D", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_159383", "flag": "0" diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 7310a5ed5..9d58bfc29 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15952F", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15961D", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_159694", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15970B", "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15976D", "flag": "FLAG_HIDE_FANCLUB_BOY" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF", "flag": "FLAG_HIDE_FANCLUB_LADY" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_159831", "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index ba40fea8f..35a00a498 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_LINK_CONTEST_ROOM_POKEBALL" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 2a432f363..2ce0ea4a1 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -25,7 +25,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_14D6DF", "flag": "0" @@ -38,7 +38,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_14D6CD", "flag": "FLAG_HIDE_FAT_MAN_LITTLEROOT" @@ -51,7 +51,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_14D6D6", "flag": "0" @@ -64,7 +64,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_14DCE2", "flag": "FLAG_HIDE_MOM_LITTLEROOT" @@ -77,7 +77,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOVING_TRUCK_BRENDAN" @@ -90,7 +90,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOVING_TRUCK_MAY" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 166451028..5c8d5c2e0 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9", "flag": "FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9", "flag": "FLAG_HIDE_MACHOKE_MOVER_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6", "flag": "FLAG_HIDE_MACHOKE_MOVER_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1529EB", "flag": "FLAG_HIDE_BRENDAN_MOM" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_NORMAN_LITTLEROOT" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index bb38b7c46..2d0a0f901 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_2F_EventScript_152A9D", "flag": "FLAG_HIDE_BRENDAN_UPSTAIRS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOM_UPSTAIRS" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 15b502ef3..ac2048fbf 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1B6BE9", "flag": "FLAG_HIDE_MAY_MOM_DOWNSTAIRS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1B6CA6", "flag": "FLAG_HIDE_MACHOKE_MOVER_1" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1B6CB9", "flag": "FLAG_HIDE_MACHOKE_MOVER_2" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1529EB", "flag": "FLAG_HIDE_MAY_MOM" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_NORMAN_LITTLEROOT" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 8c1861439..877166683 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_2F_EventScript_152A9D", "flag": "FLAG_HIDE_MAY_UPSTAIRS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOM_UPSTAIRS" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAY_PICHU_DOLL" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index cef892407..214bc4654 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152D63", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152D9A", "flag": "FLAG_HIDE_BIRCH_IN_LAB" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152EA3", "flag": "FLAG_HIDE_RIVAL_BIRCH_LAB" diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index b4df38381..dba9b43bc 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_15D7CE", "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_15D7ED", "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 14, "movement_range_y": 6, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_1F_EventScript_15D80C", "flag": "0" diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index e2b9bf84b..c3b75214a 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "MagmaHideout_B1F_EventScript_15D850", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_B1F_EventScript_15D875", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_B1F_EventScript_15D89A", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B1F_EventScript_1B19C2", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_1" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B1F_EventScript_1B19DC", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_2" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B1F_EventScript_1A04FD", "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B1F_EventScript_1B19CF", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_3" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B1F_EventScript_1A051B", "flag": "FLAG_HIDE_ELECTRODE_2_HIDEOUT" diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index e1a03b59c..8562e15d6 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B2F_EventScript_15D8E1", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 7, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_B2F_EventScript_15D962", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_B2F_EventScript_15D987", "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_B2F_EventScript_1B19E9", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B2F_1" diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index deef6ac38..18e4963fa 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -40,7 +40,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C05A", "flag": "0" @@ -53,7 +53,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C075", "flag": "0" @@ -66,7 +66,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C063", "flag": "0" @@ -79,7 +79,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C06C", "flag": "0" @@ -92,7 +92,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C0A2", "flag": "0" @@ -105,7 +105,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C0F9", "flag": "FLAG_HIDE_WALLY_MAUVILLE" @@ -118,7 +118,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C0C4", "flag": "FLAG_HIDE_WALLY_FATHER_MAUVILLE" @@ -131,7 +131,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_14C2F2", "flag": "FLAG_HIDE_WATTSON_MAUVILLE" @@ -144,7 +144,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1B171E", "flag": "FLAG_ITEM_MAUVILLE_1" diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 05872fbc9..50ad62df9 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_156796", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_15690B", "flag": "0" diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index f28ad929e..f8e2ed505 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156F84", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156F8D", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156A34", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156B6C", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156F96", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_15707C", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_1570D8", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_1570E8", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_156D1A", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_1570F8", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_157115", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_157125", "flag": "0" diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index e63936ff8..0ad9f27d4 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_1565AB", "flag": "FLAG_HIDE_WATTSON_MAUVILLE_GYM" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_1566FD", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_15672B", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_156714", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_1566E6", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_156742", "flag": "0" diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ebf7c9319..30ef32dcd 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House1_EventScript_1569FD", "flag": "0" diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 2385d61b3..83d979d2c 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House2_EventScript_1572C0", "flag": "0" diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index e4179a323..48b2dc552 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_1573BE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_1573F4", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_1573FD", "flag": "0" diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 551ad0e4d..3964d626a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_157369", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_1AE744", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_157377", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_157380", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_157389", "flag": "0" diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index d4a8e42ab..163d79fb4 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_1573A2", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_1573A8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_1573AE", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_1573B4", "flag": "0" diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index ab56a3c4f..221538cf2 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_1B17FB", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_1B1815", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_3" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_1B1808", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_2" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_1B1822", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_15C656", "flag": "FLAG_HIDE_PROF_COSMO_METEOR_FALLS" diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 4580e9b23..91a12d462 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_15C679", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_2R_EventScript_15C6B7", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_2R_EventScript_15C6FD", "flag": "0" diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index d1c02e53a..cfc99f8a7 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_B1F_2R_EventScript_1B182F", "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_1" diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 392e7ebd4..c9238ec9a 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFB7", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFC9", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFAE", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFC0", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFD2", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1B1745", "flag": "FLAG_ITEM_MOSSDEEP_1" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14D011", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14CFDB", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_14D027", "flag": "0" diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 1c79748c3..c2cc37d06 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_GameCorner_1F_EventScript_15AD42", "flag": "0" diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 8eda40f65..6c2c8f4da 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 72b0499c4..a054a3a8b 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_15A56B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_15A74E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_15A77C", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_15A7C1", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_15A7AA", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_15A765", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_Gym_EventScript_15A793", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_15A7D8", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_15A56B", "flag": "0" diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index fcb0a5455..f8fb6e396 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_15A82F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_15A85F", "flag": "0" diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 5a43747ff..597fac8ff 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_15A869", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_15A872", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_15A87B", "flag": "FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE" diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index b5f4dd201..335ce50e7 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House3_EventScript_15A972", "flag": "0" diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index f7bafeb6a..f23896831 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_15AB31", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_15AB50", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_15AB77", "flag": "0" diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 0cc9d7f28..8c985ab2b 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_15A926", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_15A956", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_15A95F", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_15A968", "flag": "0" diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 4b8a9b59c..16d1152da 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8DA", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8E8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8F1", "flag": "0" diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index bb0bd4786..ed4ab3c74 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_15A913", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_15A919", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_15A91F", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_15A90A", "flag": "0" diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index f73363201..b250b5382 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AB8B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_15ABCC", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_15ABD5", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AC1F", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AC16", "flag": "0" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index b2ddc566f..8537f7291 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC49", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC40", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC37", "flag": "0" diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 1f3be9321..96b29bc77 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_15AAF9", "flag": "FLAG_HIDE_STEVEN_STEVENS_HOUSE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_15AA7C", "flag": "FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_15AB20", "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_15AB02", "flag": "FLAG_HIDE_STEVENS_LETTER" diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index f432ddc41..fada71876 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_1B2C95", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_1B2CCB", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtChimney_EventScript_15D110", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D162", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D159", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D0FE", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D0F5", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D107", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15CF95", "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D162", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D174", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D13E", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -214,7 +214,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D150", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -227,7 +227,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D13E", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -240,7 +240,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D174", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -253,7 +253,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -266,7 +266,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D174", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -279,7 +279,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -292,7 +292,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_15D127", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -305,7 +305,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D174", "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" @@ -318,7 +318,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_15D16B", "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" @@ -331,7 +331,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_15D1E3", "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" @@ -344,7 +344,7 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtChimney_EventScript_15D221", "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" @@ -357,7 +357,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_15D238", "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" @@ -370,7 +370,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_15D24F", "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 0fd291caa..761d074de 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_CableCarStation_EventScript_15C14B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 5747b70d1..1c02bd68f 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_15D323", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_15D35C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_15D365", "flag": "0" diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index dba85a8fa..d49dcb1e9 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_15D39B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_1B1933", "flag": "FLAG_ITEM_MT_PYRE_2F_1" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_15D389", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_15D392", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_15D3CD", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_15D3B2", "flag": "0" diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 594e6bf08..a2f36446f 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_3F_EventScript_15D3E9", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_3F_EventScript_15D400", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_3F_EventScript_1B1940", "flag": "FLAG_ITEM_MT_PYRE_3F_1" diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index a47ced86c..6469f0b8c 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_4F_EventScript_15D418", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_4F_EventScript_1B194D", "flag": "FLAG_ITEM_MT_PYRE_4F_1" diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 465ed07f7..11ffc89db 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_5F_EventScript_15D430", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_5F_EventScript_1B195A", "flag": "FLAG_ITEM_MT_PYRE_5F_1" diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index f95bc310d..5dad923b4 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_6F_EventScript_15D448", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_6F_EventScript_1B1967", "flag": "FLAG_ITEM_MT_PYRE_6F_1" diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index e58591664..3cb7c7815 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_1B1974", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_1B1981", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_2" diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index c57858d45..cb7c8db49 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_15D5EF", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LEADER_MT_PYRE_SUMMIT" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_15D623", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_1B2DA9", "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_1B2DC0", "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_1B2DD7", "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 53f6cd305..0aef219af 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_1B183C", "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_1B1849", "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_1B1856", "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_1B1863", "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_1B1870", "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_15E900", "flag": "FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_15E91E", "flag": "FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_15E93C", "flag": "FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE" diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 55c96ca33..103d384a7 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_14DDB3", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_14DDBC", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_14DEDF", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_14DF30", "flag": "FLAG_HIDE_RIVAL_OLDALE_TOWN" diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 51c124e99..568b9187b 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House1_EventScript_152EEC", "flag": "0" diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index e9e477ca1..b863c6f72 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_152EF6", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_152EFF", "flag": "0" diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 5ef397b20..960be303b 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_152F79", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_152FC6", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_152FE5", "flag": "0" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 5f27f1af7..007924f75 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_152F17", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_152F25", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_152F2E", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_152F37", "flag": "0" diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2da8b5347..2bd8eff9c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_152F66", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_152F6C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_152F72", "flag": "0" diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index e2d2c51e0..19d9ee42c 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_14E909", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_14E912", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_14E900", "flag": "0" diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8d8f7872f..4e8810514 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_154155", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_15415E", "flag": "0" diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index c0ec16e14..702277046 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_154168", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_154267", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_154282", "flag": "0" diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index b42480887..c4cdcb362 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_154342", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_15429E", "flag": "0" diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 20fdcc9f7..4f5fd22b1 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_154355", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_15434C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_15435E", "flag": "0" diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index 541cac276..cda98d9db 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_154394", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_1543BA", "flag": "0" diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 629093f52..744594889 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_153F18", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154129", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154117", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154120", "flag": "0" diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index aaa4c37c9..ac2849775 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_153F48", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_153F4E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_15414E", "flag": "0" diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index f9e9029a1..7e0462022 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_14B7C3", "flag": "FLAG_HIDE_WALLY_MOM_PETALBURG_1" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WALLY_PETALBURG" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_14B7AC", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_14B824", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WALLY_FATHER_PETALBURG" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WALLY_MOTHER_PETALBURG" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1B1704", "flag": "FLAG_ITEM_PETALBURG_1" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1B1711", "flag": "FLAG_ITEM_PETALBURG_2" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_14BA2D", "flag": "0" diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index f18ca8549..0e96f6731 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_1545B9", "flag": "FLAG_HIDE_NORMAN_PETALBURG_GYM" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154EE6", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154DF6", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154E32", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154F22", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154E6E", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154F5E", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_154EAA", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_15518B", "flag": "FLAG_HIDE_PETALBURG_GYM_GUIDE" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WALLY_PETALBURG_GYM" diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 306e3b6aa..ca5dfb729 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_1551E8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_1551DF", "flag": "0" diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 795a86244..943c9b1f9 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_1551F2", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_1551FB", "flag": "0" diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 1cc632844..db1e4a94d 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_1552B0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_15532C", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_155323", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_15531A", "flag": "0" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index ac27f67a3..bf15fd1cc 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_155213", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_1B1B14", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_155221", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_15522A", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_155233", "flag": "0" diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 9f32c5995..df425c8f5 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_15529D", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_1552A3", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_1552A9", "flag": "0" diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 2eb5e8ce3..c5e040de6 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_1543C4", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_154445", "flag": "0" diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 619808a48..36c312bbe 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_DEVON_PETALBURG_WOODS" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_1B175F", "flag": "FLAG_ITEM_PETALBURG_WOODS_2" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_1B1752", "flag": "FLAG_ITEM_PETALBURG_WOODS_1" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_1B176C", "flag": "FLAG_ITEM_PETALBURG_WOODS_3" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_15CECA", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_15CF27", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_15CF3E", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_15CED3", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_1B1779", "flag": "FLAG_ITEM_PETALBURG_WOODS_4" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_15CEDC", "flag": "0" diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 513fe058c..804987129 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RecordCorner_EventScript_1A44BC", "flag": "0" diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 58f046257..4f1a18acd 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_14EA64", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BIRCH_BATTLE_POOCHYENA" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_14EA7F", "flag": "FLAG_HIDE_BIRCH_STARTERS_BAG" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_POOCHYENA_ROUTE101" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1A037F", "flag": "FLAG_HIDE_BIRCH_ROUTE101" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_14EA6D", "flag": "FLAG_HIDE_BOY_ROUTE101" diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index a08922258..54262a239 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_14EADA", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_14EAFE", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route102_EventScript_14EB3C", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_14EB53", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_14EAF5", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_1B1439", "flag": "FLAG_ITEM_ROUTE102_1" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "2", "script": "S_BerryTree", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "1", "script": "S_BerryTree", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_14EB6A", "flag": "0" diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 02f9b30c3..fdf6241f4 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_14ED82", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_14EB92", "flag": "FLAG_HIDE_RIVAL_ROUTE103" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_14ED94", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_14EDF1", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_14EDAB", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_14EE37", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "5", "script": "S_BerryTree", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "6", "script": "S_BerryTree", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "7", "script": "S_BerryTree", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_14ED79", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1A037F", "flag": "FLAG_HIDE_BIRCH_ROUTE103" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_14EE4E", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1B1446", "flag": "FLAG_ITEM_ROUTE103_1" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 402186fe0..fd90b70e5 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF4B", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF42", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "Route104_EventScript_14F1A0", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF81", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF8A", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EFCC", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14F172", "flag": "0" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "8", "script": "S_BerryTree", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "9", "script": "S_BerryTree", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "10", "script": "S_BerryTree", "flag": "0" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "11", "script": "S_BerryTree", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "12", "script": "S_BerryTree", "flag": "0" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "13", "script": "S_BerryTree", "flag": "0" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EEC8", "flag": "0" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "3", "script": "S_BerryTree", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "4", "script": "S_BerryTree", "flag": "0" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "75", "script": "S_BerryTree", "flag": "0" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "76", "script": "S_BerryTree", "flag": "0" @@ -295,7 +295,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1B1453", "flag": "FLAG_ITEM_ROUTE104_1" @@ -308,7 +308,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF09", "flag": "FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE" @@ -321,7 +321,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14F25A", "flag": "0" @@ -334,7 +334,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14F279", "flag": "0" @@ -347,7 +347,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_14F1DE", "flag": "0" @@ -360,7 +360,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_14F21C", "flag": "0" @@ -373,7 +373,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1B1460", "flag": "FLAG_ITEM_ROUTE104_2" @@ -386,7 +386,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 5, "movement_range_y": 6, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route104_EventScript_14F189", "flag": "0" @@ -399,7 +399,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1B146D", "flag": "FLAG_ITEM_ROUTE104_3" @@ -412,7 +412,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -425,7 +425,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1B147A", "flag": "FLAG_ITEM_ROUTE104_4" @@ -438,7 +438,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_14EF93", "flag": "0" diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index c63adc21d..6dcc22109 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_15BCEB", "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_15BDD1", "flag": "FLAG_HIDE_PEEKO_BRINEY_HOUSE" diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 43be93d0c..b949583ed 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_15BE0B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_15BEA4", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_15BEDA", "flag": "0" diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 5d3ecfb4a..286dbaaa2 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route104_Prototype_EventScript_160D2E", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D60", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D60", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route104_Prototype_EventScript_160D7B", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route104_Prototype_EventScript_160D92", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route104_Prototype_EventScript_160DA9", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160C4B", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160CA3", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D45", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D45", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D13", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_Prototype_EventScript_160D0A", "flag": "0" diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 98e93f16a..8e532a031 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1", "flag": "0" diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 9a4119af2..378acb257 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route105_EventScript_14F2D2", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_14F2E9", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_14F300", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_14F317", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route105_EventScript_1B1487", "flag": "FLAG_ITEM_ROUTE105_1" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_14F2BB", "flag": "0" diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index db91a4888..6fba97556 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_14F338", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_14F34F", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route106_EventScript_14F366", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_14F3A4", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route106_EventScript_1B1494", "flag": "FLAG_ITEM_ROUTE106_1" diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 38aeaa80a..369697c74 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route107_EventScript_14F3BC", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 6, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route107_EventScript_14F3D3", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route107_EventScript_14F411", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route107_EventScript_14F428", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route107_EventScript_14F43F", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route107_EventScript_14F45A", "flag": "0" diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index c4589064e..0763b7dfc 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_14F476", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_14F4A4", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_14F48D", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 6, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_14F4BB", "flag": "0" diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 520b0590a..8345481c4 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F680", "flag": "FLAG_HIDE_MR_BRINEY_ROUTE109" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_14F7AD", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_14F7C4", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_14F7DB", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_14F7F2", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_14F809", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_14F847", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F705", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1B14A1", "flag": "FLAG_ITEM_ROUTE109_1" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_14F89C", "flag": "0" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_14F885", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F8B3", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F70E", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F725", "flag": "0" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F776", "flag": "0" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F8E5", "flag": "0" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F8CA", "flag": "0" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F77F", "flag": "0" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_14F788", "flag": "0" diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index f5ab2fc3b..49e8a7751 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route109_SeashoreHouse_EventScript_160DD4", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_160EB8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_160EEE", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_160ED3", "flag": "0" diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 900b7b0e9..93fb927dc 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9D4", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9CB", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9C2", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9B0", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9B9", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F9A7", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F99E", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 2, "movement_range_y": 14, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FB7D", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FB28", "flag": "0" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_14FB94", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FB3F", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FA8E", "flag": "0" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_14FAA5", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FABC", "flag": "0" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_14FAFA", "flag": "0" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "16", "script": "S_BerryTree", "flag": "0" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "17", "script": "S_BerryTree", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "18", "script": "S_BerryTree", "flag": "0" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1B14BB", "flag": "FLAG_ITEM_ROUTE110_2" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1B14AE", "flag": "FLAG_ITEM_ROUTE110_1" @@ -295,7 +295,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14FA53", "flag": "0" @@ -308,7 +308,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F946", "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" @@ -321,7 +321,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F95C", "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" @@ -334,7 +334,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F972", "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" @@ -347,7 +347,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_14F988", "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" @@ -360,7 +360,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" @@ -373,7 +373,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 7, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_14FB11", "flag": "0" @@ -386,7 +386,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_ROUTE110" @@ -399,7 +399,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110" @@ -412,7 +412,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_14FC10", "flag": "0" @@ -425,7 +425,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_14FBD2", "flag": "0" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index f5aa399d1..dc7060d9b 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB", "flag": "0" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 1c101fb14..2d17f1f79 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F", "flag": "0" diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index fb2b69f8d..bf413874d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEnd_EventScript_16199E", "flag": "FLAG_HIDE_TRICKMASTER_END" diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 91fe0ca4d..ca869dcdc 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEntrance_EventScript_16121A", "flag": "FLAG_HIDE_TRICKMASTER_ENTRANCE" diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 7e751f290..e9d7922ae 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route110_TrickHousePuzzle1_EventScript_161D31", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle1_EventScript_161D48", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_TrickHousePuzzle1_EventScript_161D5F", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_14" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_17" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_16" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_15" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_19" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_18" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1A" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1C" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1B" @@ -214,7 +214,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1D" @@ -227,7 +227,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1E" @@ -240,7 +240,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_1B1A51", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1" @@ -253,7 +253,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_1F" diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index f7cbe12c5..c006dcebc 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle2_EventScript_161E78", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle2_EventScript_161E8F", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route110_TrickHousePuzzle2_EventScript_161EA6", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_1B1A6B", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_1B1A5E", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1" diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 09e65aab2..6ff77999b 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_162708", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_16271F", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_162736", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_12" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_13" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_14" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_1B1A85", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_1B1A78", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_15" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_16" diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 43e1e81f6..020c1442f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle4_EventScript_16276B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle4_EventScript_162799", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle4_EventScript_162782", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_1B1A92", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_15" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_17" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_18" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_19" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1A" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1B" diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 9ce88d3b6..f3fc7de40 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_1627F2", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_162813", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_162834", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_162855", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_162876", "flag": "0" diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index a6394d018..d6c9966f4 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle6_EventScript_163107", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle6_EventScript_16311E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route110_TrickHousePuzzle6_EventScript_163135", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle6_EventScript_1B1A9F", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1" diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 373b30748..508cc6d1f 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle7_EventScript_1633D6", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_163404", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_1633ED", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle7_EventScript_1B1AAC", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1" diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 936925f86..19d7a006f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle8_EventScript_163439", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle8_EventScript_163467", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_163450", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle8_EventScript_1B1AB9", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1" diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5a5c23e2e..5f3dba03f 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1501D1", "flag": "FLAG_HIDE_VICTOR_WINSTRATE" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_VICTORIA_WINSTRATE" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_VIVI_WINSTRATE" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_VICKI_WINSTRATE" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1503BE", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "19", "script": "S_BerryTree", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "20", "script": "S_BerryTree", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_150395", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1503A7", "flag": "0" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_150403", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1503D5", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1503EC", "flag": "0" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE442", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE422", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_12" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1500C5", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1B14C8", "flag": "FLAG_ITEM_ROUTE111_1" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "80", "script": "S_BerryTree", "flag": "0" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "81", "script": "S_BerryTree", "flag": "0" @@ -295,7 +295,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE4E2", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" @@ -308,7 +308,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE502", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" @@ -321,7 +321,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE562", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" @@ -334,7 +334,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1AE582", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" @@ -347,7 +347,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1B14D5", "flag": "FLAG_ITEM_ROUTE111_2" @@ -360,7 +360,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1B14E2", "flag": "FLAG_ITEM_ROUTE111_3" @@ -373,7 +373,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" @@ -386,7 +386,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_150458", "flag": "0" @@ -399,7 +399,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_150441", "flag": "0" @@ -412,7 +412,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_15046F", "flag": "0" @@ -425,7 +425,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1504C4", "flag": "0" @@ -438,7 +438,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_150486", "flag": "0" @@ -451,7 +451,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1A3858", "flag": "FLAG_HIDE_SECRET_POWER_MAN" @@ -464,7 +464,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_150023", "flag": "FLAG_HIDE_ROOT_FOSSIL" @@ -477,7 +477,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_150069", "flag": "FLAG_HIDE_CLAW_FOSSIL" @@ -490,7 +490,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_15039E", "flag": "0" diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 8269b34f6..a617e7307 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_OldLadysRestStop_EventScript_15BFDB", "flag": "0" diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 3241998c5..2ee5c83de 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_15BF80", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_15BF25", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_15BF3A", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_15BF95", "flag": "0" diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index e6876a2d9..88cf1c2b3 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_150513", "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route112_EventScript_150549", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_15059E", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1505B5", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route112_EventScript_150560", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_15051C", "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "24", "script": "S_BerryTree", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "23", "script": "S_BerryTree", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "22", "script": "S_BerryTree", "flag": "0" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "21", "script": "S_BerryTree", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_150540", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1B14EF", "flag": "FLAG_ITEM_ROUTE112_1" diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 3f9a7377e..b3b8c0ea1 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route112_CableCarStation_EventScript_15C08C", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 8a49c686c..89d17de44 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_15060E", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_150605", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_15063B", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_150652", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route113_EventScript_150669", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1B14FC", "flag": "FLAG_ITEM_ROUTE113_1" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1B1509", "flag": "FLAG_ITEM_ROUTE113_2" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1506FC", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_150717", "flag": "0" diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 5e8e6d5a9..14982c2d4 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_163565", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_1639D6", "flag": "0" diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 9980ae967..d237ccf16 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "77", "script": "S_BerryTree", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "78", "script": "S_BerryTree", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route114_EventScript_1507F1", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route114_EventScript_150808", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_15081F", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_150836", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_15084D", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "68", "script": "S_BerryTree", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1B1516", "flag": "FLAG_ITEM_ROUTE114_1" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1B1523", "flag": "FLAG_ITEM_ROUTE114_2" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_150782", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1507C3", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_150733", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1508E0", "flag": "0" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1508C9", "flag": "0" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_15088B", "flag": "0" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_12" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_13" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_14" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_15" @@ -303,7 +303,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_150912", "flag": "0" @@ -316,7 +316,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1508F7", "flag": "0" diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index fc6608a89..0cc1cebc5 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsHouse_EventScript_15C1C3", "flag": "0" diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 7a7f76711..dd42dd934 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsTunnel_EventScript_15C20F", "flag": "0" diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index abde113c6..af62dac96 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route114_LanettesHouse_EventScript_15C262", "flag": "FLAG_HIDE_LANETTE" diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index cc2f976d9..2e6fb8545 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_15092E", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route115_EventScript_150949", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_15099E", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "69", "script": "S_BerryTree", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "70", "script": "S_BerryTree", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "71", "script": "S_BerryTree", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_1509DC", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route115_EventScript_150987", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_150A1A", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1B1530", "flag": "FLAG_ITEM_ROUTE115_1" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1B153D", "flag": "FLAG_ITEM_ROUTE115_2" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1B154A", "flag": "FLAG_ITEM_ROUTE115_3" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "55", "script": "S_BerryTree", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "56", "script": "S_BerryTree", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1B1557", "flag": "FLAG_ITEM_ROUTE115_4" diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 8e466e012..2ec98302e 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "25", "script": "S_BerryTree", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "26", "script": "S_BerryTree", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_150C62", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_150C79", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1B1571", "flag": "FLAG_ITEM_ROUTE116_2" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1B157E", "flag": "FLAG_ITEM_ROUTE116_3" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "66", "script": "S_BerryTree", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "67", "script": "S_BerryTree", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_150B5D", "flag": "FLAG_HIDE_BRINEY_ROUTE116" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_150CCE", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_14" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1B158B", "flag": "FLAG_ITEM_ROUTE116_4" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_150CE5", "flag": "0" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_150CFC", "flag": "0" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_150C90", "flag": "0" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_150A7B", "flag": "FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1B1564", "flag": "FLAG_ITEM_ROUTE116_1" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_150A49", "flag": "FLAG_HIDE_TUNNER_DIGGER_ROUTE116" @@ -303,7 +303,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_150B8F", "flag": "FLAG_HIDE_LOST_GLASSES_MAN" diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index f5927d4b0..9b07d84e3 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_15C2E8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_15C2FA", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_15C2F1", "flag": "0" diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 58f8875a2..368fa9d6e 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_150D57", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_150D60", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1B222D", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_150E09", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route117_EventScript_150DCB", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route117_EventScript_150D8D", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "29", "script": "S_BerryTree", "flag": "0" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "28", "script": "S_BerryTree", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "27", "script": "S_BerryTree", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1B1598", "flag": "FLAG_ITEM_ROUTE117_1" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1B15A5", "flag": "FLAG_ITEM_ROUTE117_2" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route117_EventScript_150E47", "flag": "0" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_150E85", "flag": "0" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_150EE2", "flag": "0" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_150E9C", "flag": "0" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_150D69", "flag": "0" diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index abf33dae3..ebb732d35 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route117_PokemonDayCare_EventScript_1B2327", "flag": "0" diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index e5c9690e3..36370de83 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "31", "script": "S_BerryTree", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "32", "script": "S_BerryTree", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "33", "script": "S_BerryTree", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_151139", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE462", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE482", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_150F93", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE522", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE542", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE562", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1AE582", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_150F34", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route118_EventScript_15108F", "flag": "0" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1510E4", "flag": "0" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_151150", "flag": "0" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route118_EventScript_1510CD", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1510FB", "flag": "0" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_STEVEN_ROUTE118" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1B15B2", "flag": "FLAG_ITEM_ROUTE118_1" diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 65f784333..af2aa1f35 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "34", "script": "S_BerryTree", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "35", "script": "S_BerryTree", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "36", "script": "S_BerryTree", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_151491", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_151463", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_15144C", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1514BF", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_151435", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route119_EventScript_1514FD", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_15147A", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1514A8", "flag": "0" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route119_EventScript_151569", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_151580", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_15153B", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_151552", "flag": "0" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_ROUTE119" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B15BF", "flag": "FLAG_ITEM_ROUTE119_1" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B15CC", "flag": "FLAG_ITEM_ROUTE119_2" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B15D9", "flag": "FLAG_ITEM_ROUTE119_3" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B15E6", "flag": "FLAG_ITEM_ROUTE119_4" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B15F3", "flag": "FLAG_ITEM_ROUTE119_5" @@ -303,7 +303,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B1600", "flag": "FLAG_ITEM_ROUTE119_6" @@ -316,7 +316,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1515C5", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -329,7 +329,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1515DC", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -342,7 +342,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE" @@ -355,7 +355,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1515F3", "flag": "0" @@ -368,7 +368,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "83", "script": "S_BerryTree", "flag": "0" @@ -381,7 +381,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "84", "script": "S_BerryTree", "flag": "0" @@ -394,7 +394,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "85", "script": "S_BerryTree", "flag": "0" @@ -407,7 +407,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "86", "script": "S_BerryTree", "flag": "0" @@ -420,7 +420,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_15141A", "flag": "0" @@ -433,7 +433,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1B160D", "flag": "FLAG_ITEM_ROUTE119_7" @@ -446,7 +446,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1515FC", "flag": "0" @@ -459,7 +459,7 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_151597", "flag": "0" @@ -472,7 +472,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1A057A", "flag": "FLAG_HIDE_KECLEON_ROUTE119_1" @@ -485,7 +485,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1A0587", "flag": "FLAG_HIDE_KECLEON_ROUTE119_2" @@ -498,7 +498,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1515AE", "flag": "0" diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 7c5395d29..cb41137b0 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DDE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_163DE7", "flag": "0" diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index ef0477682..3ca2fd306 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route119_WeatherInstitute_1F_EventScript_163C94", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_1F_EventScript_163CAB", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_163C7A", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_163C71", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_163C4D", "flag": "0" diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 2893c39e8..13f9009c8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route119_WeatherInstitute_2F_EventScript_163CFC", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_2F_EventScript_163D13", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_163D2A", "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_163DCC", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F" diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index c9a163922..a625d926b 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "46", "script": "S_BerryTree", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "45", "script": "S_BerryTree", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "44", "script": "S_BerryTree", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "43", "script": "S_BerryTree", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "37", "script": "S_BerryTree", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "38", "script": "S_BerryTree", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "39", "script": "S_BerryTree", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "40", "script": "S_BerryTree", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "41", "script": "S_BerryTree", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "42", "script": "S_BerryTree", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1519B3", "flag": "0" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1519CA", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "Route120_EventScript_151A08", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route120_EventScript_151A1F", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_151A36", "flag": "0" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1B161A", "flag": "FLAG_ITEM_ROUTE120_1" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1AE4C2", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1AE4A2", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1AE562", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1AE582", "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -303,7 +303,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1B1627", "flag": "FLAG_ITEM_ROUTE120_2" @@ -316,7 +316,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_151739", "flag": "0" @@ -329,7 +329,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_151A74", "flag": "0" @@ -342,7 +342,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_151A8B", "flag": "0" @@ -355,7 +355,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_151AA2", "flag": "0" @@ -368,7 +368,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_151AB9", "flag": "0" @@ -381,7 +381,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1B1641", "flag": "FLAG_ITEM_ROUTE120_4" @@ -394,7 +394,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1B1634", "flag": "FLAG_ITEM_ROUTE120_3" @@ -407,7 +407,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_151998", "flag": "FLAG_HIDE_KECLEON_ROUTE120_1" @@ -420,7 +420,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_151853", "flag": "FLAG_HIDE_STEVEN_ROUTE120" @@ -433,7 +433,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_14" @@ -446,7 +446,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -459,7 +459,7 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_151AD0", "flag": "0" @@ -472,7 +472,7 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_151AE7", "flag": "0" @@ -485,7 +485,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_KECLEON_ROUTE120_2" @@ -498,7 +498,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1A0539", "flag": "FLAG_HIDE_KECLEON_ROUTE120_3" @@ -511,7 +511,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1A0546", "flag": "FLAG_HIDE_KECLEON_ROUTE120_4" @@ -524,7 +524,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1A0553", "flag": "FLAG_HIDE_KECLEON_ROUTE120_5" @@ -537,7 +537,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1A056D", "flag": "FLAG_HIDE_KECLEON_ROUTE120_7" @@ -550,7 +550,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1A0560", "flag": "FLAG_HIDE_KECLEON_ROUTE120_6" diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index de0def82e..92fc5b59f 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_151B0A", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "47", "script": "S_BerryTree", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "48", "script": "S_BerryTree", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "49", "script": "S_BerryTree", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "50", "script": "S_BerryTree", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "51", "script": "S_BerryTree", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "52", "script": "S_BerryTree", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "53", "script": "S_BerryTree", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "54", "script": "S_BerryTree", "flag": "0" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_151BDE", "flag": "0" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_151BF9", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNTS_ROUTE121" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNTS_ROUTE121" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNTS_ROUTE121" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_151B72", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route121_EventScript_151B89", "flag": "0" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_151BC7", "flag": "0" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_151C14", "flag": "0" @@ -295,7 +295,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_1B164E", "flag": "FLAG_ITEM_ROUTE121_1" @@ -308,7 +308,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 1bde0de82..3c1220c49 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_15C351", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_15C35A", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 3d7914161..4cb877538 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "58", "script": "S_BerryTree", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "59", "script": "S_BerryTree", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "60", "script": "S_BerryTree", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "61", "script": "S_BerryTree", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "62", "script": "S_BerryTree", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "63", "script": "S_BerryTree", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "64", "script": "S_BerryTree", "flag": "0" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_151CD1", "flag": "0" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_151CE8", "flag": "0" @@ -147,7 +147,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "65", "script": "S_BerryTree", "flag": "0" @@ -160,7 +160,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "72", "script": "S_BerryTree", "flag": "0" @@ -173,7 +173,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "73", "script": "S_BerryTree", "flag": "0" @@ -186,7 +186,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "74", "script": "S_BerryTree", "flag": "0" @@ -199,7 +199,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "79", "script": "S_BerryTree", "flag": "0" @@ -212,7 +212,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "14", "script": "S_BerryTree", "flag": "0" @@ -225,7 +225,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "15", "script": "S_BerryTree", "flag": "0" @@ -238,7 +238,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "30", "script": "S_BerryTree", "flag": "0" @@ -251,7 +251,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_11" @@ -264,7 +264,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_12" @@ -277,7 +277,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_CuttableTree", "flag": "FLAG_TEMP_13" @@ -290,7 +290,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1B165B", "flag": "FLAG_ITEM_ROUTE123_1" @@ -303,7 +303,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1B1668", "flag": "FLAG_ITEM_ROUTE123_2" @@ -316,7 +316,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_151C5D", "flag": "0" @@ -329,7 +329,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "87", "script": "S_BerryTree", "flag": "0" @@ -342,7 +342,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "88", "script": "S_BerryTree", "flag": "0" @@ -355,7 +355,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "89", "script": "S_BerryTree", "flag": "0" @@ -368,7 +368,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_151CFF", "flag": "0" @@ -381,7 +381,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_151DAD", "flag": "0" @@ -394,7 +394,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_151D92", "flag": "0" @@ -407,7 +407,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route123_EventScript_151D16", "flag": "0" @@ -420,7 +420,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_151D54", "flag": "0" @@ -433,7 +433,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route123_EventScript_151DC8", "flag": "0" @@ -446,7 +446,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1B1675", "flag": "FLAG_ITEM_ROUTE123_3" @@ -459,7 +459,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1B1682", "flag": "FLAG_ITEM_ROUTE123_4" diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 2de87d68a..9cdf9620e 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_1639E9", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_163A64", "flag": "0" diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 07c6c35ac..717381caf 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_151DF8", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_151E0F", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_151E26", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 6, "movement_range_y": 8, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_151E64", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route124_EventScript_151E7B", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_1B168F", "flag": "FLAG_ITEM_ROUTE124_2" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_1B169C", "flag": "FLAG_ITEM_ROUTE124_3" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_1B16A9", "flag": "FLAG_ITEM_ROUTE124_1" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_151E92", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_151ED8", "flag": "0" diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 365faa9d2..775508c2d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route124_DivingTreasureHuntersHouse_EventScript_163E04", "flag": "0" diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 1257bc3f3..51e39ac41 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_151F2E", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_151F45", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_151F5C", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 9, "movement_range_y": 9, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_151F73", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_151F8A", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route125_EventScript_151FC8", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route125_EventScript_151FE3", "flag": "0" diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 0b1f067d0..a6ab407ff 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_15200E", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 9, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_152025", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_15203C", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_152053", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route126_EventScript_1B16B6", "flag": "FLAG_ITEM_ROUTE126_1" diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index cf1d10919..6b471e370 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -40,7 +40,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_15207A", "flag": "0" @@ -53,7 +53,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route127_EventScript_152091", "flag": "0" @@ -66,7 +66,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1B16C3", "flag": "FLAG_ITEM_ROUTE127_1" @@ -79,7 +79,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1B16D0", "flag": "FLAG_ITEM_ROUTE127_2" @@ -92,7 +92,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1520A8", "flag": "0" @@ -105,7 +105,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1520D6", "flag": "0" @@ -118,7 +118,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1520BF", "flag": "0" @@ -131,7 +131,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_152104", "flag": "0" @@ -144,7 +144,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route127_EventScript_1520ED", "flag": "0" diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index ffeeea577..da4ed9c21 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -40,7 +40,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1522A4", "flag": "0" @@ -53,7 +53,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "Route128_EventScript_1522E2", "flag": "0" @@ -66,7 +66,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_STEVEN_ROUTE128" @@ -79,7 +79,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_EVIL_LEADER_ROUTE128" @@ -92,7 +92,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_LEADER_ROUTE128" @@ -105,7 +105,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route128_EventScript_15234E", "flag": "0" @@ -118,7 +118,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route128_EventScript_152337", "flag": "0" @@ -131,7 +131,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_152320", "flag": "0" diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 49c90b05f..7e7ae0d8b 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route129_EventScript_152366", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_15237D", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_1523AB", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_152394", "flag": "0" diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 050f1dd3b..073549cd4 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", "movement_range_x": 3, "movement_range_y": 6, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route130_EventScript_152410", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route130_EventScript_152427", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "82", "script": "S_BerryTree", "flag": "FLAG_TEMP_11" diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index b8475d8e7..5e166047a 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 7, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_152452", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_152469", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route131_EventScript_152480", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_152497", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route131_EventScript_1524AE", "flag": "0" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route131_EventScript_1524C9", "flag": "0" diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 126e33093..e778a1341 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1524E5", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1524FC", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route132_EventScript_1B16DD", "flag": "FLAG_ITEM_ROUTE132_1" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_15252A", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route132_EventScript_152513", "flag": "0" diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index a62b50133..cf61d83d2 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_152542", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_152570", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_152559", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_1B16EA", "flag": "FLAG_ITEM_ROUTE133_1" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_1B16F7", "flag": "FLAG_ITEM_ROUTE133_2" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route133_EventScript_15259E", "flag": "0" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route133_EventScript_152587", "flag": "0" diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 13cef0f1b..566507ec6 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 3, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1525C4", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_1525DB", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route134_EventScript_152609", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1525F2", "flag": "0" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 10, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_152620", "flag": "0" diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index f08944375..b88313e14 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C3B1", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C386", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C401", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C3F8", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C3D9", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C3BA", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C449", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C45F", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C5FF", "flag": "FLAG_HIDE_DEVON_RUSTBORO" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNT_RUSTBORO" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C3A5", "flag": "0" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1B172B", "flag": "FLAG_ITEM_RUSTBORO_1" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C475", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_14C8DA", "flag": "FLAG_HIDE_RIVAL_RUSTBORO" diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index 275bbdf3f..e03fbb322 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_157D27", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_157D5D", "flag": "0" diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 79c98cb82..4ecd68663 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_157422", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_157454", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_15748F", "flag": "0" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 366aa436f..09798add6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_1574E2", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_1574F9", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_157523", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 10, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_15754D", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_157564", "flag": "0" diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index cf7d992ee..3f6033db7 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_1578B0", "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", "flag": "0" diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d8e7ffa22..71ca8ec5b 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_157C60", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_157C69", "flag": "0" diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index b262445ea..63d3aa2b2 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_157C73", "flag": "0" diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 1477e2433..01f55b7cd 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_157D83", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_157D7A", "flag": "0" diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index c99e411c5..8bd868bcd 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_157D97", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_157DA0", "flag": "0" diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 5a5be9a55..462f90bbe 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_157DDA", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_157DE3", "flag": "0" diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index e20a3125b..95a9cca8b 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_1578D9", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_157960", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_157977", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_15798E", "flag": "0" diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5886df257..5100c2d83 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_157C7D", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_157D1D", "flag": "0" diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 32e0585bc..282740365 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_157D67", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_157D70", "flag": "0" diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 5aa5ad3cb..f3ee9bfcf 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_157DED", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_157DF6", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_157DFF", "flag": "0" diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index ddd770acc..389da78f2 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_157BD4", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_157C4D", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_157C44", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_157C56", "flag": "0" diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 0db82f965..86fcd070c 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_157B88", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_157B96", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_157B9F", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_157BA8", "flag": "0" diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index d4c0a47f8..5d4209a8f 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_157BC1", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_157BC7", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_157BCD", "flag": "0" diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index c83fe43e1..cc34e9c93 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157A98", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157AA1", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157AAA", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157AB3", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157ABC", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_157ACE", "flag": "0" diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 517180038..919abbd25 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_15C799", "flag": "FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_1B1786", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_1" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_1B1793", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_2" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BRINEY_RUSTURF_TUNNEL" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_15C9EA", "flag": "FLAG_HIDE_GRUNT_RUSTURF_TUNNEL" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_15C9D7", "flag": "FLAG_HIDE_PEEKO_RUSTURF_TUNNEL" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RusturfTunnel_EventScript_15CACD", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_15C782", "flag": "FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL" diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index a9dc2e319..74813ed10 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_15FDD6", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_15FE60", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_15FD96", "flag": "FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_15FD9F", "flag": "FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL" diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 2d39a4738..dabe9dbbb 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_15FED7", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 7, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_15FEEE", "flag": "0" diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 26b8ea700..6cdac8246 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FF5D", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_15FF74", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FF8B", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FFA2", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FFBD", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_15FFD8", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FFEF", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_15FF06", "flag": "FLAG_HIDE_TM_49_GIVER_SS_TIDAL" diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 162bab045..0207c6917 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_160011", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_16001A", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_11" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_12" @@ -82,7 +82,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_13" @@ -95,7 +95,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_14" @@ -108,7 +108,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_15" @@ -121,7 +121,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_16" @@ -134,7 +134,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_1B1919", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1" diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index a978577ff..fa22ddef0 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_160007", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_1B190C", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1" diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index e1e4f1376..dc62a87e4 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_160C2F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_160C38", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_160C41", "flag": "0" diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index c21f3a5ee..c99a370e5 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_1600A7", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_16008C", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_160095", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_16009E", "flag": "0" diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 149fb1d6d..fd2d06f24 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_160024", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_1B1926", "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTHWEST" diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index d77f55591..1bb82eea2 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ScorchedSlab_EventScript_1B18FF", "flag": "FLAG_ITEM_SCORCHED_SLAB_1" diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 1ff3e10d6..d37a2ce20 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_13" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SeafloorCavern_Room1_EventScript_15DA6D", "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room1_EventScript_15DA84", "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 6f118a1b6..ce9722c5a 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_15" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_18" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_19" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_17" diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index f31764448..06c6e6d7e 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_15" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_17" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_18" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_19" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room3_EventScript_15DAA8", "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 28f00360b..2150f0cda 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room4_EventScript_15DACB", "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 85ba5add7..73c9b2979 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_15" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_16" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 4c143b175..caa853d21 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_15" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_17" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_18" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_19" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1A" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1B" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1C" diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index e308633ec..c9cbc6d22 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room9_EventScript_1B1A37", "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN" diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 1100ada56..9d75509db 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 8b3b35721..d02b028c7 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 11ab94ef5..bf3eeea69 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index ce0338ac4..63ecfa4f3 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 4df7c9b36..8c45cd6ad 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f96c7ac37..e73b40718 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index b1c136f37..bfcade602 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 348b19024..d0612bf36 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 8ef1182dc..008df6c24 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 9746434b2..9587a49f0 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 4ea1ae21f..d90d9ceab 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 458d8e469..91107ac17 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 4b314b856..5217fcdef 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 10463cf97..9553d14e8 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index cbbf64305..fed30339f 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 487c0f09f..c91142b94 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 9fcb78bc3..2a5372716 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index b7c0da914..c16dbf286 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 349e340eb..5088b0da0 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index c6c0856cf..77b485700 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index ab18d10de..6fe883d39 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave1_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 07481867c..b65bb3733 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave2_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index d1060d26d..b49e200fd 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave3_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index f717b2c88..6b26daadd 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave4_EventScript_1A2FC0", "flag": "FLAG_DECORATION_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_15" diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index cb85bc9d3..5db783bc3 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_1B19F6", "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_15E076", "flag": "0" diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 614b0bd45..3e00c17bd 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_1B1A1D", "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_1B1A2A", "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2" diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index cb71337b8..53ebe6eb6 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideInnerRoom_EventScript_1B1A03", "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1" diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 4caad9c19..3604ee850 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideLowerRoom_EventScript_15E44F", "flag": "0" diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 945c23cf5..b5c200b45 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideStairsRoom_EventScript_1B1A10", "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1" diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 8d401f04f..47703ae02 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SingleBattleColosseum_EventScript_1A449E", "flag": "0" diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index edb7cb344..44854fc28 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SkyPillar_Top_EventScript_15F316", "flag": "FLAG_HIDE_RAYQUAZA" diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 537b4fbd3..8447158ae 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -35,7 +35,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BBD6", "flag": "0" @@ -48,7 +48,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BBF3", "flag": "0" @@ -61,7 +61,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BBB5", "flag": "0" @@ -74,7 +74,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BC14", "flag": "0" @@ -87,7 +87,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD3A", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BB3F", "flag": "0" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BB60", "flag": "0" @@ -126,7 +126,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BB81", "flag": "0" @@ -139,7 +139,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14C017", "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" @@ -152,7 +152,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14C020", "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" @@ -165,7 +165,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BEBC", "flag": "FLAG_HIDE_STERN_SLATEPORT" @@ -178,7 +178,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCE2", "flag": "0" @@ -191,7 +191,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCEB", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCF4", "flag": "0" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCFD", "flag": "0" @@ -230,7 +230,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD06", "flag": "0" @@ -243,7 +243,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCB8", "flag": "0" @@ -256,7 +256,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BCD9", "flag": "0" @@ -269,7 +269,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD51", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -282,7 +282,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD68", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -295,7 +295,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BE20", "flag": "0" @@ -308,7 +308,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BDF2", "flag": "0" @@ -321,7 +321,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14C029", "flag": "0" @@ -334,7 +334,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BAE0", "flag": "0" @@ -347,7 +347,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BE9A", "flag": "FLAG_HIDE_TM_SALESMAN_SLATEPORT" @@ -360,7 +360,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BAB6", "flag": "0" @@ -373,7 +373,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD7F", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -386,7 +386,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BD96", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -399,7 +399,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BDAD", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -412,7 +412,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BDC4", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" @@ -425,7 +425,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_14BDDB", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index 6084fcd54..803b35db0 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_15554C", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_155555", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_15559F", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_1555B4", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_1555C9", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_1555DE", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_1555F3", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_155608", "flag": "0" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_15561D", "flag": "0" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_155632", "flag": "0" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_15565C", "flag": "0" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_155647", "flag": "0" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestHall_EventScript_15555E", "flag": "0" diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index bcb51b116..44a98ea06 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_15541D", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1B7795", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1554DE", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1554E7", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1AE0B6", "flag": "FLAG_HIDE_CONTEST_REPORTER_SLATEPORT" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_155536", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1554F9", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_ContestLobby_EventScript_1554F0", "flag": "0" diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 43aa2334c..6a7bf3969 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_1560C4", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_1561FF", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_156208", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_156211", "flag": "FLAG_HIDE_STERN_SLATEPORT_HARBOR" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR" diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index 596a3c7ad..a9b24dab5 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House1_EventScript_15567B", "flag": "0" diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 93ff24a83..b27168eca 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_156390", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_156399", "flag": "0" diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index cf4541605..69e227101 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_156411", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_15643E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_156447", "flag": "0" diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 7e88562c9..db9aaec0f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155ADB", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BA1", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BAA", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155B98", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155B8F", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BB3", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155ADB", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BBC", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C16", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C1F", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C28", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C31", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C3A", "flag": "FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 578249d64..e00f2ade1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_155CE6", "flag": "FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F34", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F3D", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F46", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 67c8eb1e3..de1a16a27 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_1563CE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_1563DC", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_1563E5", "flag": "0" diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 0b97403b1..b7d8799fe 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_1563FE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_156404", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_15640A", "flag": "0" diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 0226b2688..d5a39eb54 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155A7F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155A88", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_1ADFA0", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155A15", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_15576B", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155AA4", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155A91", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_155AB7", "flag": "0" diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index d506e68aa..b916af9ea 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_155336", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_1553E3", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_1553EC", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_1553F5", "flag": "FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD" diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 75caaada4..d2a35e317 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_1553FF", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_155408", "flag": "0" diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 6a7d8bda2..b4e5504eb 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D18D", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D196", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D16E", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D268", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D48F", "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D19F", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D2C5", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D2E4", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D287", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D498", "flag": "FLAG_HIDE_STEVEN_SOOTOPOLIS" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_14D2A6", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 541c548a1..e28450cd1 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_15AFFF", "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_15B084", "flag": "0" diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 1c1f356e7..9a0619421 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_15B0D8", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_15B11D", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_15B106", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SootopolisCity_Gym_B1F_EventScript_15B134", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SootopolisCity_Gym_B1F_EventScript_15B162", "flag": "0" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_15B179", "flag": "0" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_15B0EF", "flag": "0" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_15B14B", "flag": "0" diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 2bf4bd5ef..8c024eca8 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_15B29B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_15B2D1", "flag": "0" diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 608a9a9bb..09ec1c06f 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House2_EventScript_15B2E5", "flag": "0" diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 915a3b63a..282e50bc4 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_15B31A", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_15B343", "flag": "0" diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 33dd96c46..61bbfa10b 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_15B34D", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_15B356", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_15B35F", "flag": "0" diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index dd424dcf1..89becb6c6 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_15B373", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_15B37C", "flag": "0" diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index b7c3a0874..19df640ce 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House6_EventScript_15B386", "flag": "0" diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 9d98555d9..9ccef3f2b 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_15B3EE", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_15B3F7", "flag": "0" diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index d4bc31546..07ea5c5a0 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House8_EventScript_15B492", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House8_EventScript_15B401", "flag": "0" diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 36435f04c..43ae2ca93 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_15B21B", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_15B24A", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_15B272", "flag": "0" diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 944e7afda..795e69cd6 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_15BC70", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_15B1A8", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_15B1D0", "flag": "0" diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 83f4627fc..ff92662bb 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_15B208", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_15B20E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_15B214", "flag": "0" diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index abac82272..2a8bfd397 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SouthernIsland_Exterior_EventScript_160AE0", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 80c109755..c93edfe2f 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LATIOS_OR_LATIAS_FLYING" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY" diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f80e362be..f31bfc8c6 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TradeCenter_EventScript_1A44AD", "flag": "0" diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 030de2c7e..6ec900a6f 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_15DA3F", "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_15DA3F", "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_15DA3F", "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_15DA3F", "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c79294e3a..e8b7d746d 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -30,7 +30,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_14E899", "flag": "0" @@ -43,7 +43,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_14E866", "flag": "0" @@ -56,7 +56,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_14E8AB", "flag": "0" @@ -69,7 +69,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_14E8A2", "flag": "0" diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 80225a30d..90215698b 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestHall_EventScript_153EA9", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestHall_EventScript_153E97", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestHall_EventScript_153EA0", "flag": "0" diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index feb2dfbed..acd5caa8c 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_153D76", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_1B77A0", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_153E47", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_153E3E", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_1AE0B6", "flag": "FLAG_HIDE_CONTEST_REPORTER_VERDANTURF" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_ContestLobby_EventScript_153E80", "flag": "0" diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 21d102b64..0d9e9113a 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_154030", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9", "flag": "0" diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index dacece217..b09e47a12 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_1540ED", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_1540F6", "flag": "0" diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 367f8e510..445ea2e1e 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_153EBC", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_153EEE", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_153EF7", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_153F00", "flag": "0" diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 41945575a..220aceaec 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F18", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F26", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F2F", "flag": "0" diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index c5dddc69c..b5b8c9fef 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_153F48", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_153F4E", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_153F54", "flag": "0" diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 599bfe697..3986443e2 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_153F5B", "flag": "FLAG_HIDE_WALLY_WANDAS_HOUSE" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_153FAF", "flag": "FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_153F7D", "flag": "FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_153FEA", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_153FB8", "flag": "FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE" diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index c26c4fc51..8c4dfb9ae 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_15DF6F", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_1F_EventScript_15DF9D", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_15DF86", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_15DF28", "flag": "FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_1B1AC6", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_1" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_1B1AD3", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_2" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_15DF31", "flag": "FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD" diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index a33cf522a..2473a819f 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_13" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_14" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_11" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_12" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_17" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_16" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1E" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_19" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_1A" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_1B" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_1C" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_TEMP_1D" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_PushableBoulder", "flag": "FLAG_TEMP_1F" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_B1F_EventScript_15DFB5", "flag": "0" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B1F_EventScript_15DFCC", "flag": "0" @@ -214,7 +214,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B1F_EventScript_15DFE3", "flag": "0" @@ -227,7 +227,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "S_BreakableRock", "flag": "FLAG_VICTORY_ROAD_ROCK" @@ -240,7 +240,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_1B1AE0", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_1" @@ -253,7 +253,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_1B1AED", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_2" diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 58f5d73fc..0a0ee1a57 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -19,7 +19,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_15DFFB", "flag": "0" @@ -32,7 +32,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B2F_EventScript_15E012", "flag": "0" @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_15E029", "flag": "0" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_15E040", "flag": "0" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B2F_EventScript_1B1AFA", "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_1" diff --git a/include/constants/trainer_types.h b/include/constants/trainer_types.h new file mode 100644 index 000000000..c2adf1e12 --- /dev/null +++ b/include/constants/trainer_types.h @@ -0,0 +1,8 @@ +#ifndef GUARD_CONSTANTS_TRAINER_TYPES_H +#define GUARD_CONSTANTS_TRAINER_TYPES_H + +#define TRAINER_TYPE_NONE 0 +#define TRAINER_TYPE_NORMAL 1 +#define TRAINER_TYPE_SEE_ALL_DIRECTIONS 2 + +#endif // GUARD_CONSTANTS_TRAINER_TYPES_H |