diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 69a8b31cb..c88afc806 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_CaptainsOffice_EventScript_29126E", "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" } diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index d2f65aee4..4ddf92226 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", "flag": "0" } diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 7e27751b1..9bccfc636 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", "flag": "0" } diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 51fc0f260..f71ad8eb3 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" } diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index f762b08f9..60dd5e1b3 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Room_B1F_EventScript_291254", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" } diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 84ccb93dc..49a4c2da0 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_1F_EventScript_291261", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Rooms2_1F_EventScript_238186", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", "flag": "0" } diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 2e8256331..3f56bf6cd 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms2_B1F_EventScript_291247", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" } diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 789b4edb5..e97c74fcf 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_237A93", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_1F_EventScript_29122D", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", "flag": "0" } diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 224b25165..65b5fb9cf 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AbandonedShip_Rooms_B1F_EventScript_29123A", "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" } diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 327e7eded..9de100bff 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AncientTomb_EventScript_23905A", "flag": "FLAG_HIDE_REGISTEEL" } diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 278bc5894..5f585f32f 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_233494", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_1F_EventScript_2334C6", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 13, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_1F_EventScript_2334F8", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 80c4af8ef..5b6beee11 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233A85", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B1F_EventScript_233AB0", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291372", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233AD5", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291358", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_2339EB", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_291365", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B1F_EventScript_233A38", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "AquaHideout_B1F_EventScript_233AEC", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index e028195fa..64c6eddff 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_233E09", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "AquaHideout_B2F_EventScript_233E8A", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "AquaHideout_B2F_EventScript_29137F", "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B2F_EventScript_233EAF", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "AquaHideout_B2F_EventScript_233EC6", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index a0792d733..2092ca7ea 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ArtisanCave_1F_EventScript_2914D1", "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" } diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index d47609dc8..32174cd44 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ArtisanCave_B1F_EventScript_2914C4", "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" } diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 5b1a51ad5..6299e7b11 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 2cacf6621..02f3cd019 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index fc8e5bd37..49712c5dd 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index e897866d4..e3a6c915b 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 3f7dc3bda..6e7f2c3f5 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index c94d1e1c7..89eeb60e4 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 0e96decdf..293a9cc22 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index de1cdd2ff..5f45fa7ac 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 87ad1077a..8ed837413 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index 4d9d792f7..fd20b7180 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index b0405cff0..cfa4cf97f 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 34378700e..9d635efc7 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index ccdbe327a..c1d79ee50 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index e35831a6d..98b061e9f 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 938e4da3f..5854c6bf7 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index 0a548665c..630a0e335 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index 437e7fcfd..a07464a15 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ca416ce54..ac9230c53 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json index 2184971eb..4c7bcad2a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index aab03982f..14a2e7d23 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 7ffd80dcf..4f99b9488 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index ff5fc875a..fcb459426 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index 736fd55c8..c8efe3399 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 60d7bc73a..698edcc65 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index c99dcac09..5081edd82 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index a15882e77..de898bef4 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index 6af03f7f9..f4cbd3590 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 4773d78ed..339b20b56 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_Apprentice", "flag": "FLAG_HIDE_APPRENTICE" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", "flag": "0" } diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 2a9726fc0..f3b080732 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049", "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" } diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index 3f6b1681e..8d4870f4f 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E775", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E94D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge1_EventScript_25E956", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index bade81462..e2ace0b93 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260643", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_26073C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260747", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_26075D", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge2_EventScript_260752", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 592f65a7b..5ff702a86 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261D83", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FE1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FC1", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FD1", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge3_EventScript_261FB8", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 9165d21fb..b67d3bb07 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_26358D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_263596", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge4_EventScript_26359F", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 500b0fb71..698569d9b 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_2645C6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264617", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264620", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge5_EventScript_264629", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 0b48dbbcf..1ecbec9f8 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge6_EventScript_264FED", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 28fd390f7..da866ea72 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_2656DB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_265255", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_265445", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge7_EventScript_2656E4", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 13cf5e254..ff2bd2361 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676DC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676CA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Lounge8_EventScript_2676D3", "flag": "0" } diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 3d4faf383..9f0a56ba0 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 068a46b72..46f6de9af 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267ACC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B0B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B02", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_Mart_EventScript_267B20", "flag": "0" } diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 700c24aff..e119f89a0 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C67", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C70", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C79", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C82", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C8B", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C94", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CBB", "flag": "0" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CE1", "flag": "0" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CB2", "flag": "0" }, @@ -145,8 +145,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 6, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CC4", "flag": "0" }, @@ -158,8 +158,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CCD", "flag": "0" }, @@ -171,8 +171,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CD6", "flag": "0" }, @@ -184,8 +184,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242C9F", "flag": "0" }, @@ -197,8 +197,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242CEA", "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, @@ -210,8 +210,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D79", "flag": "0" }, @@ -223,8 +223,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D82", "flag": "0" }, @@ -236,8 +236,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 2, "movement_range_y": 6, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D8B", "flag": "0" }, @@ -249,8 +249,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D94", "flag": "0" }, @@ -262,8 +262,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242D9D", "flag": "0" }, @@ -275,8 +275,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DA6", "flag": "0" }, @@ -288,8 +288,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DAF", "flag": "0" }, @@ -301,8 +301,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DB8", "flag": "0" }, @@ -314,8 +314,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DC3", "flag": "0" }, @@ -327,8 +327,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DE9", "flag": "0" }, @@ -340,8 +340,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242DE0", "flag": "0" }, @@ -353,8 +353,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideEast_EventScript_242E08", "flag": "0" } diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 43298e663..6f97192ed 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D50F", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D3F0", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 8, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D68B", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D52D", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D69D", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6A6", "flag": "0" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D679", "flag": "0" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D536", "flag": "0" }, @@ -145,8 +145,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D53D", "flag": "0" }, @@ -158,8 +158,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D694", "flag": "0" }, @@ -171,8 +171,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D5C6", "flag": "0" }, @@ -184,8 +184,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D635", "flag": "0" }, @@ -197,8 +197,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D57F", "flag": "0" }, @@ -210,8 +210,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D682", "flag": "0" }, @@ -223,8 +223,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_249E19", "flag": "0" }, @@ -236,8 +236,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D667", "flag": "0" }, @@ -249,8 +249,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D518", "flag": "0" }, @@ -262,8 +262,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6AF", "flag": "0" }, @@ -275,8 +275,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6B8", "flag": "0" }, @@ -288,8 +288,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6C3", "flag": "0" }, @@ -301,8 +301,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6CE", "flag": "0" }, @@ -314,8 +314,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6D7", "flag": "0" }, @@ -327,8 +327,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_OutsideWest_EventScript_23D6EE", "flag": "0" } diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 4a78ec120..8f8153c08 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", "flag": "0" } diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index 1f3babd48..caa6fed8a 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index 64fa727d7..af28ecea6 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E52F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E54A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_RankingHall_EventScript_25E573", "flag": "0" } diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ffde653f7..db140442e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_2662FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_266310", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_266436", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ReceptionGate_EventScript_2664F4", "flag": "0" } diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index aa6003a86..bff7696b3 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_ScottsHouse_EventScript_2636A8", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 57e51307b..2b0d26de0 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 3f3d6ca93..32b0ad7ec 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index 104579553..bbec7daa4 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 153130999..8f63efd06 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index d08cc103b..7e26a9ee3 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 0528d33bd..289a1e5c2 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 23a4874ea..745234547 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index ab7be039c..cac7ed96e 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 1add766dc..b5a111334 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 1450e644c..5171d112e 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index d4ebaaa2d..58ac0476f 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index 29063c950..648c3e3a6 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 71fb71e5d..c9342b3b9 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 3398dcd47..6f9461967 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 0eb433ae1..3aa2571f6 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index e6827e1a3..70b677c34 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" } diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 43ffc5d44..c87f39fb8 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Exterior_EventScript_267F83", "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_DEOXYS" } diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index f55cf8e93..b212247bb 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Harbor_EventScript_26805D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index f8c584845..2a764c677 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "CaveOfOrigin_B1F_EventScript_2357A9", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" } diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 439611a39..28a04a458 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DesertRuins_EventScript_22DA02", "flag": "FLAG_HIDE_REGIROCK" } diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 3a16f2c5d..ca4b894d4 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DesertUnderpass_EventScript_23AF41", "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" } diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 64e70fe7f..8cd863588 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E95B1", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_EventScript_1E9511", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E95D5", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_EventScript_1E9922", "flag": "0" } diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index e42e4ffe8..cf87f878a 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_1FC7C2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC8B7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC8D9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "DewfordTown_Gym_EventScript_1FC8FB", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Gym_EventScript_1FC983", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC93F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "DewfordTown_Gym_EventScript_1FC961", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "DewfordTown_Gym_EventScript_1FC91D", "flag": "0" } diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index f6a8dac7b..b801ea3c2 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD4D0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD4F9", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD50A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD547", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD563", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD57F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD62F", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD63B", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_Hall_EventScript_1FD7DA", "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" } diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index fbc3e02ed..dfae500bd 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3D7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3CE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House1_EventScript_1FC3E0", "flag": "0" } diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 742fde706..bc9c008fc 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_1FE22E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_House2_EventScript_1FE271", "flag": "0" } diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 137b9f5e9..89acf1ea8 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", "flag": "0" } diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index e4f298d73..2792a9a20 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 0281bebc5..4819c3b89 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH" } diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 92e1651e5..4fb0d16ef 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", "flag": "0" } diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 774489415..ea3116460 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", "flag": "0" } diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index c7440cf98..d0588f76a 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 36bf11a13..a0072fd08 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", "flag": "0" } diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 7263f67cb..38c527b34 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" } diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 195197b56..f1dcd3868 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 5fe580001..2a9efbeaf 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", "flag": "0" } diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 43d777f35..0d0bb68a1 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 2eceb30ae..87545b597 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", "flag": "0" } diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index e2519f880..4afffa73c 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB22B", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB20C", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB234", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_1EB23D", "flag": "FLAG_HIDE_FALLARBOR_AZURILL" } diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index 53a280196..da4c9fd4f 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 51d69dc93..60168264f 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 5c36cf3d9..aa65e71a0 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200001", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_20020D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200216", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_20021F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_BattleTentLobby_EventScript_200228", "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" } diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index fb66ad1de..e5e75c631 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_200F13", "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House1_EventScript_200FBC", "flag": "0" } diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index 2b5ea5214..fe0ce67a0 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_House2_EventScript_201383", "flag": "0" } diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 9416efe01..9248eec87 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCBF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCF4", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFCFD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_1FFD06", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_Mart_EventScript_2C80B6", "flag": "0" } diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index a432b8a1a..b1ea1ed14 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" } diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index be694d257..029a4a9c6 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 93dd0b584..e8dc6dbed 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FarawayIsland_Entrance_EventScript_267CA2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index d6531d043..b41c5461a 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 15, "movement_range_y": 15, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "1", "script": "FarawayIsland_Interior_EventScript_267DF2", "flag": "FLAG_HIDE_MEW" } diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 26c609e05..61324a8ff 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_29119E", "flag": "FLAG_ITEM_FIERY_PATH_TM06" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FieryPath_EventScript_291191", "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" } diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 0aec65572..d66ec1f4b 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25B6", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25DE", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25BF", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25F0", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25E7", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E25F9", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_EventScript_1E2614", "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 6a8d9fdab..a8654e708 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_21800E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_218017", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_218020", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_DecorationShop_EventScript_21804C", "flag": "0" } diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index ad6b7c6b9..f985b2ce4 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_2165C8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_2166A8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "FortreeCity_Gym_EventScript_2166D6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "FortreeCity_Gym_EventScript_2166ED", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "FortreeCity_Gym_EventScript_2166BF", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Gym_EventScript_216732", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "FortreeCity_Gym_EventScript_216704", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "FortreeCity_Gym_EventScript_21671B", "flag": "0" } diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 8f349e640..62469515a 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_2162BB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_216368", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House1_EventScript_21635F", "flag": "0" } diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 7b9a67ab6..17f928fe9 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House2_EventScript_2177CB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House2_EventScript_2C811E", "flag": "0" } diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index d886e0cdb..8b7e971c7 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_217AE8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House3_EventScript_217AF1", "flag": "0" } diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 11fd05bf5..a9db995ed 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217C81", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217C8A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House4_EventScript_217D20", "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" } diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 37e23502b..a60c02ec3 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217EF2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217F04", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_House5_EventScript_217EFB", "flag": "0" } diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index 3b7e0723b..c1bb6df86 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_217666", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_217698", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_2176A1", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_Mart_EventScript_2176AA", "flag": "0" } diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index f51926d3b..efa58e87b 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", "flag": "0" } diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 4984b7692..79bdfad30 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 3f720a569..67f2e8000 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_22DA5E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_1F_EventScript_291150", "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" } diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 6e3a14403..b33e751e5 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B1F_EventScript_29115D", "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" } diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 18b5ca9d4..48de00180 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_29116A", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_291177", "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_B2F_EventScript_2907A6", "flag": "FLAG_TEMP_17" } diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 22a6207c2..ae5b61a6b 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "GraniteCave_StevensRoom_EventScript_22DC7B", "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" } diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 0719696c0..d6bbd2f46 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "InsideOfTruck_EventScript_23BF6C", "flag": "0" } diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index c6365025b..27876f5e5 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "IslandCave_EventScript_238F58", "flag": "FLAG_HIDE_REGICE" } diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 1e344bff0..1b9c5471d 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_230785", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "JaggedPass_EventScript_2307FB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "JaggedPass_EventScript_291184", "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_23079C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "JaggedPass_EventScript_230718", "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_230871", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "JaggedPass_EventScript_23085A", "flag": "0" } diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index fa59b5e0e..9bec14bd1 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA73B", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA70E", "flag": "0" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA717", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA720", "flag": "0" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA729", "flag": "0" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA732", "flag": "0" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" }, @@ -132,8 +132,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_EventScript_1EA744", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index dac9467f0..aae6afc03 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index c81e42dc2..9679beb48 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", "flag": "0" } diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index c8091527c..203812fb2 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE505", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", "flag": "0" } diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 5465c81f8..a0cd74f59 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1FF912", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_1FF91B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_House_EventScript_2C804E", "flag": "0" } diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 1208d3e53..2f8d1278f 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FF9CE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FF9FE", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_Mart_EventScript_1FFA07", "flag": "0" } diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 18980fb3c..ef32ef660 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", "flag": "0" } diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index a8c2ef9a3..95d1e194f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index d10f00260..63c5925fd 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C53", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C2B", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C22", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C4A", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C91", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C72", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2C9A", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CA3", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CAC", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2D7D", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_2910E8", "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DD5", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DBA", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DC3", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DCC", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2BD8", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2DDE", "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E302D", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CEE", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CDD", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CCB", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_EventScript_1E2CD4", "flag": "0" } diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 644ec55ee..3522c7963 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B485", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B48E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B497", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4A9", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4C0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4D7", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4EE", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B505", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B51C", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B533", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B56A", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B53C", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B581", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B598", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5AF", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5C6", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5DD", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B5F4", "flag": "0" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B60B", "flag": "0" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B639", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B622", "flag": "0" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B553", "flag": "0" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B650", "flag": "0" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B667", "flag": "0" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B67E", "flag": "0" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B695", "flag": "0" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6AC", "flag": "0" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6C3", "flag": "0" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B6DA", "flag": "0" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B71C", "flag": "0" }, @@ -412,8 +412,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B705", "flag": "0" }, @@ -425,8 +425,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestHall_EventScript_21B4A0", "flag": "0" } diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 65571d71c..3cbb48f21 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A554", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A806", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FA2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A708", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A711", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A71A", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_28CA59", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A768", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FB4", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A72C", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A723", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A735", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FAB", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_293FBD", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A771", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21A798", "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", "flag": "0" } diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index f42538ba5..8f251039c 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", "flag": "0" } diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 94ae04069..0bd551815 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" } diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 2c22272ac..75a1fddf9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 784660e36..7514a548a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 58e400ff4..564377f7f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index b3fd03f00..3238eeee8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index e9d5785e6..9ecf5104a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index b41eecd31..2abccb783 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", "flag": "0" } diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 6ea8bbbf2..a49de9255 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", "flag": "0" } diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1eb68641a..28e2366e6 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_21E00F", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_Harbor_EventScript_21E637", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" } diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index b8d59e953..54fa58333 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_21ECCE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House1_EventScript_21ECD7", "flag": "0" } diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 87f5a52d9..b3e4127a6 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House2_EventScript_21ED75", "flag": "0" } diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 78dffc5f0..537fc46b3 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EF3D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EE4B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EED5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EF09", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EEA1", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House3_EventScript_21EE8A", "flag": "0" } diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 72cd396f0..f442d00ba 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_21F5B5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_House4_EventScript_21F5BE", "flag": "0" } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 72f376e23..11272059e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index ab2ae56fb..18a2829e4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" } diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d200fad22..f4adbabe8 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", "flag": "0" } diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index b58418edd..c5c0121f4 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" } diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 346a91173..6bfb1c4cb 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index b48876cce..0591d3c8e 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3", "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55", "flag": "FLAG_HIDE_FANCLUB_BOY" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7", "flag": "FLAG_HIDE_FANCLUB_LADY" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19", "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" } diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 538b0af69..664a32b29 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_LINK_CONTEST_POKE_BALL" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 1d0c2763a..7ef696a58 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -28,8 +28,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E8034", "flag": "0" }, @@ -41,8 +41,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E8022", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, @@ -54,8 +54,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E802B", "flag": "0" }, @@ -67,8 +67,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_EventScript_1E863D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, @@ -80,8 +80,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" }, @@ -93,8 +93,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" }, @@ -106,8 +106,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" }, @@ -119,8 +119,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH" } diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index efa6f6079..ca5ee92de 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN" } diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 4adc28388..e07959b20 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL" } diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 34260c77a..e1f7d823a 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" } diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index be1329fbd..d92b024c6 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" } diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 2b29f99c1..25ec2e745 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" } diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 2d07a723a..8eb3e23b5 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MagmaHideout_1F_EventScript_23988C", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2914DE", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_1F_EventScript_2398A3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_1F_EventScript_2908BA", "flag": "FLAG_TEMP_13" } diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index 75db41221..d628c1b5a 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 5, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MagmaHideout_2F_1R_EventScript_239B7F", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 7, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_2F_1R_EventScript_239B96", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "MagmaHideout_2F_1R_EventScript_239B51", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_2F_1R_EventScript_239B68", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" } diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index af80ea8ff..ef7086bbf 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "MagmaHideout_2F_2R_EventScript_239E4D", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MagmaHideout_2F_2R_EventScript_239E36", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_2F_2R_EventScript_2914EB", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_2F_2R_EventScript_239E1F", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MagmaHideout_2F_2R_EventScript_239E08", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_2F_2R_EventScript_2914F8", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" } diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index ec61d2759..67202e748 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "MagmaHideout_3F_1R_EventScript_23A1B3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_3F_1R_EventScript_23A1CA", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_1R_EventScript_291505", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" } diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 23e8d0b8c..bc67b15e5 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_3F_2R_EventScript_23A3D5", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_2R_EventScript_291512", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" } diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 40921b8ca..00fc5a46c 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_3F_3R_EventScript_29152C", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" } diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index dcec4fdb9..b627ae1ed 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A68C", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A6A3", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MagmaHideout_4F_EventScript_23A6BA", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MagmaHideout_4F_EventScript_23A6D1", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_4F_EventScript_23A560", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MagmaHideout_4F_EventScript_29151F", "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" } diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index eb3d5cc62..ec1c3389a 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE" } diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 4ee667f2b..f3bde6eb9 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3B3", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3CE", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3BC", "flag": "0" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3C5", "flag": "0" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF3FB", "flag": "0" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF452", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF41D", "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_1DF73A", "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_2910CE", "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_EventScript_2C7F7E", "flag": "0" }, @@ -173,8 +173,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" } diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index c774718f0..98c1fcee1 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_20EBBC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_BikeShop_EventScript_20ED31", "flag": "0" } diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 696694a6b..07bfd3bb2 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210125", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_21012E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FBB9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FCF1", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210137", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_21021D", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210279", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210289", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_20FE9F", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_210299", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_2102B6", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_GameCorner_EventScript_2102C6", "flag": "0" } diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 6a4429fa7..9de74941c 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_20DEEB", "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_20E0D0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0FE", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0E7", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MauvilleCity_Gym_EventScript_20E0B9", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Gym_EventScript_20E12C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MauvilleCity_Gym_EventScript_20E115", "flag": "0" } diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ec2d63cf9..d7e148b31 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House1_EventScript_20F976", "flag": "0" } diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index f29a2a34c..272b60f0f 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_House2_EventScript_210C5D", "flag": "0" } diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 23b451ae2..598ed6e52 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_2110E6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_21111C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_Mart_EventScript_211125", "flag": "0" } diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 3e63670ab..c024c2cba 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", "flag": "0" } diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 956868d68..4afcc3882 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", "flag": "0" } diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 2f20b485f..3492e05bc 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911AB", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911C5", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911B8", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_2911D2", "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_1F_1R_EventScript_22BF25", "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" } diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index f1e47c986..be52085cd 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C4DE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C540", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MeteorFalls_1F_2R_EventScript_22C5A4", "flag": "0" } diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 527813efb..7c45bfdd0 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_B1F_2R_EventScript_2911DF", "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" } diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index b3d696c8e..b23c3f952 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MeteorFalls_StevensCave_EventScript_23B182", "flag": "0" } diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index 7ba9772da..a653c6e52 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_3F_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_3F_EventScript_2907A6", "flag": "FLAG_TEMP_12" } diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index a39ed14a9..d6b69a14c 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_23AD48", "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_23AD89", "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MirageTower_4F_EventScript_2907A6", "flag": "FLAG_TEMP_11" } diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index c4eb8e773..767a99584 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AD1", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AF9", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AB2", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4AF0", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4B02", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_2910F5", "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C10", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4B0B", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C26", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_2C81EE", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C85", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_EventScript_1E4C7C", "flag": "0" } diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index ffb52896e..8ea28a474 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", "flag": "0" } diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 4469b2642..c86bf2b6e 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 81ce5e468..2d86ad9a8 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220898", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220AFD", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B2B", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B70", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B59", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B14", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B42", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220C11", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Gym_EventScript_220898", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B9E", "flag": "0" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220B87", "flag": "0" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BCC", "flag": "0" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BB5", "flag": "0" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BFA", "flag": "0" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -412,8 +412,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -425,8 +425,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MossdeepCity_Gym_EventScript_220BE3", "flag": "0" }, @@ -438,8 +438,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -451,8 +451,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -464,8 +464,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -477,8 +477,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 55e573f69..def086288 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_221FD6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House1_EventScript_222006", "flag": "0" } diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 7f2121b7f..e63a1aee6 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220DF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220E8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House2_EventScript_2220F1", "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" } diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 1f28d4d22..237a315ff 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House3_EventScript_2225C3", "flag": "0" } diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 9f9f01ebd..2d1b33335 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222DD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222DF7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_House4_EventScript_222E1E", "flag": "0" } diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 6b739a2d2..bd14a30c1 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223C8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223F6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_2223FF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_Mart_EventScript_222408", "flag": "0" } diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 6f1f3f774..fc78cc967 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", "flag": "0" } diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 7aa2e7ccb..88bf3caf2 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", "flag": "0" } diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index f53950394..0d02d368a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" } diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index a40f6ca9d..5c758bf3e 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" } diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index beedbd75a..76844e258 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_222912", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_222841", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MossdeepCity_StevensHouse_EventScript_22291B", "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" } diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index b8dd7bb09..2b19e7f8d 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EDD5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EE0B", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtChimney_EventScript_22F06E", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0C0", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0B7", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F05C", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F053", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F065", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22EEF3", "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0C9", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0A5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0AE", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F09C", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -295,8 +295,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F085", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -308,8 +308,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0DB", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, @@ -321,8 +321,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_EventScript_22F0D2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -334,8 +334,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F14A", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -347,8 +347,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "MtChimney_EventScript_22F1AC", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -360,8 +360,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1C3", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -373,8 +373,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1DA", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, @@ -386,8 +386,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtChimney_EventScript_22F1F1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, @@ -399,8 +399,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "MtChimney_EventScript_22F208", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" } diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 155686bbb..1b0efd3d9 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtChimney_CableCarStation_EventScript_22AC4B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 1969ba9cd..8b2e146f5 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F3F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F78", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_1F_EventScript_230F81", "flag": "0" } diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 07b20b3b3..7a5c4d639 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_231128", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_2912FD", "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_231116", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_2F_EventScript_23111F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MtPyre_2F_EventScript_23115A", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "MtPyre_2F_EventScript_23113F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_23118C", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_2F_EventScript_231175", "flag": "0" } diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index a1b39048e..b8684cff9 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_231753", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_23176A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_3F_EventScript_29130A", "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "MtPyre_3F_EventScript_231781", "flag": "0" } diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index a7bf954e7..59d4dd110 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_4F_EventScript_231C6E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_4F_EventScript_291317", "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" } diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index b27d426ac..1c035bd4d 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "MtPyre_5F_EventScript_231BC9", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_5F_EventScript_291324", "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" } diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index a169953f2..8f7c4f30f 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_6F_EventScript_231D3B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_6F_EventScript_291331", "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_6F_EventScript_231D9D", "flag": "0" } diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 6b35427df..2a8a5eaff 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_29133E", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Exterior_EventScript_29134B", "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" } diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index d729766d5..fedde68e8 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_23213C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "MtPyre_Summit_EventScript_2321A2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_2323FD", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232414", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_23242B", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "MtPyre_Summit_EventScript_232442", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" } diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index e4fb5a2fe..ee324635b 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Bottom_EventScript_2692A2", "flag": "FLAG_HIDE_LUGIA" } diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 39c8d9f0f..7ea3ef0e7 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Harbor_EventScript_2690BD", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 93e35bdea..4b025ccae 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_HO_OH" } diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 73a15bd0c..fe7959703 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2911EC", "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2911F9", "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291206", "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291213", "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_291220", "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2377AF", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_2377FC", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "NewMauville_Inside_EventScript_237849", "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" } diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 75437393f..164cd3eae 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E8EF3", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E8EFC", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E901F", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_EventScript_1E9070", "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" } diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index fe0ac7b6a..aa837378c 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House1_EventScript_1FBE86", "flag": "0" } diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 2de7632fd..fbcf968e7 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_1FBF5B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_House2_EventScript_1FBF64", "flag": "0" } diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 1226dd17f..9f1f894ce 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC240", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC28A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_Mart_EventScript_1FC2A9", "flag": "0" } diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 94cbe1627..7c9ed89a0 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", "flag": "0" } diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 7a899e4a9..cddd0a5a3 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 1219eabad..971bf5b86 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBACC", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBAD5", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_EventScript_1EBAC3", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 19f592374..1e48da85c 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_20365D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House1_EventScript_203666", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 370b37d73..d57720795 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_203792", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_203891", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House2_EventScript_2038AC", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 578824525..181d69a80 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_203CB5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House3_EventScript_203C11", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 2db52fe9b..d38384fc9 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F55", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F4C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House4_EventScript_203F5E", "flag": "0" } diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index b8c4a0352..db7e51c46 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_204111", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_House5_EventScript_204137", "flag": "0" } diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 1f141dec5..690243277 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", "flag": "0" } diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 2b6a43ce0..c5f7c9907 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 475eed1d4..d8f77168b 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC3FD", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC3E6", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC488", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_2910B4", "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_2910C1", "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_EventScript_1DC82E", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" } diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 6f133a979..297c58a30 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2049F1", "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2054AA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2053BA", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2053F6", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2054E6", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_205432", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_205522", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_20546E", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_20574F", "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" } diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 1345f8d6b..68e9a4dce 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_2077A3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House1_EventScript_20779A", "flag": "0" } diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index cc193445e..b6c0107a0 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_2078F3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_House2_EventScript_2078FC", "flag": "0" } diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index c811ece3c..b08837e80 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207D69", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DE8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DDF", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Mart_EventScript_207DD6", "flag": "0" } diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index a82cbb85a..eeb22dca4 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", "flag": "0" } diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 49f2942b3..279c5e44b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index b6a152be2..c961d300c 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_204278", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_WallysHouse_EventScript_2042C0", "flag": "0" } diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 534f88c92..4921b88ae 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_29110F", "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_291102", "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_29111C", "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E210", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_22E26D", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "PetalburgWoods_EventScript_22E284", "flag": "0" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E219", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_291129", "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgWoods_EventScript_22E222", "flag": "0" } diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 4b5d55c37..4777472d2 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RecordCorner_EventScript_2774C6", "flag": "0" } diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 4bda7149b..97c303c1c 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBDFB", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBE16", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_272141", "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route101_EventScript_1EBE04", "flag": "FLAG_HIDE_ROUTE_101_BOY" } diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index e6418c42c..7a6c6d963 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_1EC0E1", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC105", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route102_EventScript_1EC1B3", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC1CA", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_1EC0FC", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route102_EventScript_290CD8", "flag": "FLAG_ITEM_ROUTE_102_POTION" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "2", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "1", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route102_EventScript_1EC1E1", "flag": "0" } diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 516c4ed8f..6516e99dc 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC5E2", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC3C1", "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_1EC5F4", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route103_EventScript_1EC66E", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route103_EventScript_1EC60B", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route103_EventScript_1EC6D1", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "5", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "6", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "7", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_1EC5D9", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_272141", "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC6E8", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_290CE5", "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route103_EventScript_1EC761", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route103_EventScript_1EC74A", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC78F", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route103_EventScript_1EC778", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route103_EventScript_290CF2", "flag": "FLAG_ITEM_ROUTE_103_PP_UP" } diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 0b0ed6837..e14a73c29 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED00F", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED006", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route104_EventScript_1ED38D", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED045", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED04E", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED090", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED35F", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 8, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "8", "script": "BerryTreeScript", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 9, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "9", "script": "BerryTreeScript", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 10, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "10", "script": "BerryTreeScript", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 11, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "11", "script": "BerryTreeScript", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 12, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "12", "script": "BerryTreeScript", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 13, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "13", "script": "BerryTreeScript", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECF8C", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "3", "script": "BerryTreeScript", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "4", "script": "BerryTreeScript", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 75, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "75", "script": "BerryTreeScript", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 76, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "76", "script": "BerryTreeScript", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290CFF", "flag": "FLAG_ITEM_ROUTE_104_PP_UP" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECFCD", "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route104_EventScript_1ED597", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route104_EventScript_1ED5B6", "flag": "0" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_1ED43B", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route104_EventScript_1ED4E9", "flag": "0" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D0C", "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 5, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route104_EventScript_1ED376", "flag": "0" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D19", "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_290D26", "flag": "FLAG_ITEM_ROUTE_104_POTION" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED057", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ED5D5", "flag": "0" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_EventScript_1ECC9E", "flag": "FLAG_HIDE_ROUTE_104_RIVAL" } diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index bdd2361e0..438d56b30 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_229D67", "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_MrBrineysHouse_EventScript_229E5D", "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" } diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index cd00d18e1..9d3d30794 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", "flag": "0" } diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 937582aff..b42965229 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route105_EventScript_1EE261", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE278", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE28F", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE2A6", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route105_EventScript_290D33", "flag": "FLAG_ITEM_ROUTE_105_IRON" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route105_EventScript_1EE24A", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route105_EventScript_1EE2BD", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route105_EventScript_1EE2D4", "flag": "0" } diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index fd86567e9..93e98078b 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE493", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE4AA", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route106_EventScript_1EE4C1", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route106_EventScript_1EE523", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route106_EventScript_290D40", "flag": "FLAG_ITEM_ROUTE_106_PROTEIN" } diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index dcb17ed8c..3813f4795 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route107_EventScript_1EE595", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 6, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route107_EventScript_1EE5AC", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE60E", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE625", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route107_EventScript_1EE63C", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route107_EventScript_1EE657", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route107_EventScript_1EE672", "flag": "0" } diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index daa9dab75..bb22c01e3 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE68A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6B8", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6A1", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route108_EventScript_1EE6CF", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route108_EventScript_1EE6E6", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route108_EventScript_1EE6FD", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route108_EventScript_290D4D", "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" } diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index b3bd9f507..9bb4d21de 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE910", "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_1EEA3D", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route109_EventScript_1EEA54", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEA6B", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route109_EventScript_1EEA82", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEA99", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_1EEAFB", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE995", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_290D5A", "flag": "FLAG_ITEM_ROUTE_109_PP_UP" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB74", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB5D", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEB8B", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE99E", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EE9B5", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA06", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEBBD", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route109_EventScript_1EEBA2", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA0F", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_1EEA18", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route109_EventScript_1EEBEF", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route109_EventScript_1EEBD8", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_EventScript_290D67", "flag": "FLAG_ITEM_ROUTE_109_POTION" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route109_EventScript_1EEC06", "flag": "0" } diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index e30fcc078..3f293b291 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route109_SeashoreHouse_EventScript_2693FE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_2694E2", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_269518", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route109_SeashoreHouse_EventScript_2694FD", "flag": "0" } diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index bcf04e1ef..404155652 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF338", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF32F", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF326", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF314", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF31D", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF30B", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF302", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 2, "movement_range_y": 14, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF529", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF4B0", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_1EF540", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF4C7", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_EventScript_1EF3F2", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_1EF409", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_EventScript_1EF420", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_EventScript_1EF482", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 16, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "16", "script": "BerryTreeScript", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 17, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "17", "script": "BerryTreeScript", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 18, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "18", "script": "BerryTreeScript", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D81", "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D74", "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF3B7", "flag": "0" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2AA", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2C0", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2D6", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_1EF2EC", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 7, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF499", "flag": "0" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF604", "flag": "0" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF5A2", "flag": "0" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_EventScript_1EF61C", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_EventScript_1EF64A", "flag": "0" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_EventScript_1EF633", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_EventScript_290D8E", "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" }, @@ -493,8 +493,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_110_BIRCH" } diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 5536716af..b692426fd 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", "flag": "0" } diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 347f22ba1..dcc9029e5 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", "flag": "0" } diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 13c6b53a5..62548fe8b 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEnd_EventScript_26AD17", "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" } diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index cd2e63edc..59280848e 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHouseEntrance_EventScript_269D3B", "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" } diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 283e86793..849e74b62 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route110_TrickHousePuzzle1_EventScript_26B948", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle1_EventScript_26B976", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_17" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_16" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_15" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_19" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_18" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1B" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_29140E", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1C" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", "flag": "FLAG_TEMP_1E" } diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 12b436f73..9903231e7 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_291428", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle2_EventScript_29141B", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" } diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 5d6227cd2..22807b80b 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_291442", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_291435", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", "flag": "FLAG_TEMP_16" } diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 03a953310..542a67aec 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route110_TrickHousePuzzle4_EventScript_26C895", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_29144F", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", "flag": "FLAG_TEMP_1A" } diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 5b83f31e0..ae94ed240 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", "flag": "0" } diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index b468e59be..144916353 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle6_EventScript_29145C", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" } diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index a4a12eb7f..0263e0848 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E389", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle7_EventScript_291469", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 023223740..f73e60337 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route110_TrickHousePuzzle8_EventScript_26E836", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route110_TrickHousePuzzle8_EventScript_291476", "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" } diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 0061ffefb..ef981272a 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F0FC5", "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F121B", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 19, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "19", "script": "BerryTreeScript", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 20, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "20", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F1189", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1204", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F1260", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1F1232", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1249", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CDF6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CDD6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F0EB9", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290D9B", "flag": "FLAG_ITEM_ROUTE_111_TM_37" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 80, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "80", "script": "BerryTreeScript", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 81, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "81", "script": "BerryTreeScript", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CE96", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CEB6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DA8", "flag": "FLAG_ITEM_ROUTE_111_STARDUST" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DB5", "flag": "FLAG_ITEM_ROUTE_111_HP_UP" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F12D9", "flag": "0" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F12C2", "flag": "0" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F12F0", "flag": "0" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 4, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route111_EventScript_1F1369", "flag": "0" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F1307", "flag": "0" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_2765FF", "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F1192", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route111_EventScript_1F13F9", "flag": "0" }, @@ -493,8 +493,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route111_EventScript_1F1410", "flag": "0" }, @@ -506,8 +506,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route111_EventScript_1F13E2", "flag": "0" }, @@ -519,8 +519,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route111_EventScript_1F13CB", "flag": "0" }, @@ -532,8 +532,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route111_EventScript_1F143E", "flag": "0" }, @@ -545,8 +545,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route111_EventScript_1F1427", "flag": "0" }, @@ -558,8 +558,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route111_EventScript_1F1455", "flag": "0" }, @@ -571,8 +571,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_290DC2", "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" }, @@ -584,8 +584,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F119B", "flag": "0" }, @@ -597,8 +597,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" }, @@ -610,8 +610,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" }, @@ -623,8 +623,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_EventScript_1F11E4", "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" } diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index d4e77fdda..c915bfb95 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_OldLadysRestStop_EventScript_22A920", "flag": "0" } diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index d41cc1214..fed3dab3f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", "flag": "0" } diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 937719abf..8839cc114 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route112_EventScript_1F1E6A", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EE3", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1EFA", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1E81", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1DB7", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 24, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "24", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 23, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "23", "script": "BerryTreeScript", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 22, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "22", "script": "BerryTreeScript", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 21, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "21", "script": "BerryTreeScript", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_1F1E61", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_EventScript_290DCF", "flag": "FLAG_ITEM_ROUTE_112_NUGGET" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F11", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route112_EventScript_1F1F28", "flag": "0" } diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 8552ec139..52958a4ee 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route112_CableCarStation_EventScript_22AB17", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 7dc18e572..1ae33fda7 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1F2193", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_1F218A", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_1F21C0", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_1F21D7", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route113_EventScript_1F21EE", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DDC", "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DE9", "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F2250", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 3, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "3", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22B2", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22C9", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F22E4", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_290DF6", "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route113_EventScript_1F2344", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_1F232D", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_1F22FF", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_1F2316", "flag": "0" } diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 185461fdb..70e342048 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_26ED1E", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route113_GlassWorkshop_EventScript_26F194", "flag": "0" } diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 75f975eb6..9d1002910 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 77, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "77", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 78, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "78", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route114_EventScript_1F2640", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route114_EventScript_1F2657", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F266E", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F2685", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F269C", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 68, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "68", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E03", "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E10", "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F25D1", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2612", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2582", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2777", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_1F2760", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F26FE", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route114_EventScript_1F27A9", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route114_EventScript_1F278E", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F27DB", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route114_EventScript_1F27C4", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_EventScript_290E1D", "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route114_EventScript_1F27F2", "flag": "0" } diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index c3c29bdd9..0c5c5ea77 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", "flag": "0" } diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 84370ce04..0582198db 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", "flag": "0" } diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 5dbe09a09..b4b1b412b 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route114_LanettesHouse_EventScript_22B2D2", "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" } diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 58e5a602b..1c7603b58 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_1F2973", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route115_EventScript_1F298E", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2A07", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 69, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "69", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 70, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "70", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 71, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "71", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_1F2A69", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route115_EventScript_1F29F0", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2ACB", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E2A", "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E37", "flag": "FLAG_ITEM_ROUTE_115_TM_01" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E44", "flag": "FLAG_ITEM_ROUTE_115_IRON" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 55, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "55", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 56, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "56", "script": "BerryTreeScript", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E51", "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route115_EventScript_1F2AE2", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route115_EventScript_1F2AF9", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B27", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B10", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route115_EventScript_1F2B3E", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E6B", "flag": "FLAG_ITEM_ROUTE_115_PP_UP" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route115_EventScript_290E5E", "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" } diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 35ced7587..79aa60e75 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 25, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "25", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 26, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "26", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2E89", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F2EA0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E85", "flag": "FLAG_ITEM_ROUTE_116_ETHER" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E92", "flag": "FLAG_ITEM_ROUTE_116_REPEL" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 66, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "66", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 67, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "67", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2D84", "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2F65", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E9F", "flag": "FLAG_ITEM_ROUTE_116_HP_UP" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F2F7C", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route116_EventScript_1F2F93", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route116_EventScript_1F2EB7", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2CA2", "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290E78", "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2C70", "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_1F2DB6", "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route116_EventScript_1F3041", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route116_EventScript_1F3058", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_290EAC", "flag": "FLAG_ITEM_ROUTE_116_POTION" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_EventScript_2906BB", "flag": "FLAG_TEMP_15" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route116_EventScript_1F3086", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route116_EventScript_1F306F", "flag": "0" } diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 0301a32ee..f9dfb484c 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B85A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B86C", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route116_TunnelersRestHouse_EventScript_22B863", "flag": "0" } diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index ab9aa7b24..c4cb4d5e5 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F399A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F39A3", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_291C18", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 8, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3A94", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route117_EventScript_1F3A32", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F39D0", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 29, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "29", "script": "BerryTreeScript", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 28, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "28", "script": "BerryTreeScript", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 27, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "27", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_290EB9", "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_290EC6", "flag": "FLAG_ITEM_ROUTE_117_REVIVE" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route117_EventScript_1F3AF6", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3B58", "flag": "0" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route117_EventScript_1F3BD3", "flag": "0" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route117_EventScript_1F3B6F", "flag": "0" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_EventScript_1F39AC", "flag": "0" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C4E", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C65", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route117_EventScript_1F3C37", "flag": "0" } diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index a62485c74..c233701e5 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route117_PokemonDayCare_EventScript_291D11", "flag": "0" } diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 8514596c8..66b7a1789 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 31, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "31", "script": "BerryTreeScript", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 32, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "32", "script": "BerryTreeScript", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 33, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "33", "script": "BerryTreeScript", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4079", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CE16", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CE36", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F3E73", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CED6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CEF6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F3E14", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route118_EventScript_1F3F87", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_1F4000", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4090", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route118_EventScript_1F3FE9", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route118_EventScript_1F4017", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_118_STEVEN" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route118_EventScript_290ED3", "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route118_EventScript_1F40A7", "flag": "0" } diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index b7e59c363..bdb3e923d 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 34, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "34", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 35, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "35", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 36, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "36", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47E2", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47B4", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F479D", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4810", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F4786", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_EventScript_1F4872", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47CB", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F47F9", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route119_EventScript_1F4902", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4919", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F48D4", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route119_EventScript_1F48EB", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_RIVAL" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EE0", "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EED", "flag": "FLAG_ITEM_ROUTE_119_ZINC" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290EFA", "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F07", "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F14", "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F21", "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49A3", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49BA", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49D1", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 83, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "83", "script": "BerryTreeScript", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 84, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "84", "script": "BerryTreeScript", "flag": "0" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 85, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "85", "script": "BerryTreeScript", "flag": "0" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 86, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "86", "script": "BerryTreeScript", "flag": "0" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F476B", "flag": "0" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F2E", "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F49DA", "flag": "0" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4930", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_27231C", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_272329", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_1F4947", "flag": "0" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route119_EventScript_1F498C", "flag": "0" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_EventScript_1F4975", "flag": "0" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route119_EventScript_1F495E", "flag": "0" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_291399", "flag": "FLAG_ITEM_ROUTE_119_NUGGET" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_EventScript_290F3B", "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_119_SCOTT" } diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index fdfd19f78..31d84664f 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_270966", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_House_EventScript_27096F", "flag": "0" } diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 9101e2495..8200c20df 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", "flag": "0" } diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index a8a1ebf62..4b4534a8e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route119_WeatherInstitute_2F_EventScript_27018B", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" } diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index db93042de..63585f86f 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 46, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "46", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 45, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "45", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 44, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "44", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 43, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "43", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 37, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "37", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 38, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "38", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 39, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "39", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 40, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "40", "script": "BerryTreeScript", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 41, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "41", "script": "BerryTreeScript", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 42, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "42", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F57D7", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F57EE", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route120_EventScript_1F5850", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route120_EventScript_1F5867", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F587E", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F48", "flag": "FLAG_ITEM_ROUTE_120_NUGGET" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CE76", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CE56", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CF16", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_28CF36", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F55", "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F5527", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F58E0", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F58F7", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route120_EventScript_1F590E", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5925", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F6F", "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F62", "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F57BC", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_1F5641", "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_14" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F593C", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5953", "flag": "0" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722DB", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722E8", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_2722F5", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_27230F", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_272302", "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F5981", "flag": "0" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route120_EventScript_1F596A", "flag": "0" }, @@ -592,8 +592,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route120_EventScript_290F7C", "flag": "FLAG_ITEM_ROUTE_120_REVIVE" } diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 62719c2c5..ad20a8119 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_1F5DFD", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 47, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "47", "script": "BerryTreeScript", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 48, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "48", "script": "BerryTreeScript", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 49, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "49", "script": "BerryTreeScript", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 50, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "50", "script": "BerryTreeScript", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 51, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "51", "script": "BerryTreeScript", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 52, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "52", "script": "BerryTreeScript", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 53, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "53", "script": "BerryTreeScript", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 54, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "54", "script": "BerryTreeScript", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route121_EventScript_1F5F04", "flag": "0" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route121_EventScript_1F5F1F", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5E74", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route121_EventScript_1F5E8B", "flag": "0" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5EED", "flag": "0" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5F3A", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290F89", "flag": "FLAG_ITEM_ROUTE_121_CARBOS" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route121_EventScript_1F5F9C", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5FB3", "flag": "0" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route121_EventScript_1F5FCA", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route121_EventScript_1F5FE1", "flag": "0" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route121_EventScript_1F5FF8", "flag": "0" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290F96", "flag": "FLAG_ITEM_ROUTE_121_REVIVE" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_EventScript_290FA3", "flag": "FLAG_ITEM_ROUTE_121_ZINC" } diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index bda91381a..90eedd773 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 d5a99b75c..6562fa7a9 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 58, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "58", "script": "BerryTreeScript", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 59, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "59", "script": "BerryTreeScript", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 60, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "60", "script": "BerryTreeScript", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 61, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "61", "script": "BerryTreeScript", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 62, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "62", "script": "BerryTreeScript", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 63, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "63", "script": "BerryTreeScript", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 64, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "64", "script": "BerryTreeScript", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F61C5", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F61DC", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 65, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "65", "script": "BerryTreeScript", "flag": "0" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 72, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "72", "script": "BerryTreeScript", "flag": "0" }, @@ -176,8 +176,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 73, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "73", "script": "BerryTreeScript", "flag": "0" }, @@ -189,8 +189,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 74, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "74", "script": "BerryTreeScript", "flag": "0" }, @@ -202,8 +202,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 79, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "79", "script": "BerryTreeScript", "flag": "0" }, @@ -215,8 +215,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 14, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "14", "script": "BerryTreeScript", "flag": "0" }, @@ -228,8 +228,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 15, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "15", "script": "BerryTreeScript", "flag": "0" }, @@ -241,8 +241,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 30, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "30", "script": "BerryTreeScript", "flag": "0" }, @@ -254,8 +254,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_11" }, @@ -267,8 +267,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_12" }, @@ -280,8 +280,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_2906BB", "flag": "FLAG_TEMP_13" }, @@ -293,8 +293,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FB0", "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" }, @@ -306,8 +306,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_1F6151", "flag": "0" }, @@ -319,8 +319,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 87, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "87", "script": "BerryTreeScript", "flag": "0" }, @@ -332,8 +332,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 88, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "88", "script": "BerryTreeScript", "flag": "0" }, @@ -345,8 +345,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 89, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "89", "script": "BerryTreeScript", "flag": "0" }, @@ -358,8 +358,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F61F3", "flag": "0" }, @@ -371,8 +371,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F62E9", "flag": "0" }, @@ -384,8 +384,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F62CE", "flag": "0" }, @@ -397,8 +397,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route123_EventScript_1F620A", "flag": "0" }, @@ -410,8 +410,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F626C", "flag": "0" }, @@ -423,8 +423,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route123_EventScript_1F6304", "flag": "0" }, @@ -436,8 +436,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FBD", "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" }, @@ -449,8 +449,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FCA", "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" }, @@ -462,8 +462,8 @@ "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F6377", "flag": "0" }, @@ -475,8 +475,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route123_EventScript_1F6360", "flag": "0" }, @@ -488,8 +488,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route123_EventScript_1F6349", "flag": "0" }, @@ -501,8 +501,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F63BC", "flag": "0" }, @@ -514,8 +514,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F6332", "flag": "0" }, @@ -527,8 +527,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route123_EventScript_1F631B", "flag": "0" }, @@ -540,8 +540,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FD7", "flag": "FLAG_ITEM_ROUTE_123_PP_UP" }, @@ -553,8 +553,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route123_EventScript_1F638E", "flag": "0" }, @@ -566,8 +566,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route123_EventScript_1F63A5", "flag": "0" }, @@ -579,8 +579,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_EventScript_290FE4", "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" } diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 47ad26314..c87feb2bc 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_26F845", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route123_BerryMastersHouse_EventScript_26F8C0", "flag": "0" } diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 1f3ef4f6c..7169a0299 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F6585", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F659C", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route124_EventScript_1F65B3", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 8, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F6615", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 7, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route124_EventScript_1F662C", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FF1", "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_290FFE", "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_EventScript_29100B", "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F6643", "flag": "0" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route124_EventScript_1F66A7", "flag": "0" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route124_EventScript_1F670B", "flag": "0" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route124_EventScript_1F6722", "flag": "0" } diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index ed159e565..2b61cd6fa 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", "flag": "0" } diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 55f9b692d..8071cf244 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F67A4", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F67BB", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F67D2", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 9, "movement_range_y": 9, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F67E9", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route125_EventScript_1F6800", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route125_EventScript_1F6862", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route125_EventScript_1F687D", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F6898", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route125_EventScript_1F68AF", "flag": "0" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route125_EventScript_291018", "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" } diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 8ccd3c365..1e886a083 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 10, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F68D6", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 9, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F68ED", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F6904", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route126_EventScript_1F691B", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route126_EventScript_291025", "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6960", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6977", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6949", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route126_EventScript_1F6932", "flag": "0" } diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 06fd540d2..1b30f7d55 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6A35", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route127_EventScript_1F6A4C", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_291032", "flag": "FLAG_ITEM_ROUTE_127_ZINC" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_29103F", "flag": "FLAG_ITEM_ROUTE_127_CARBOS" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A63", "flag": "0" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A91", "flag": "0" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_1F6A7A", "flag": "0" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6AA8", "flag": "0" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route127_EventScript_1F6AD6", "flag": "0" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route127_EventScript_1F6ABF", "flag": "0" }, @@ -173,8 +173,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route127_EventScript_29104C", "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" } diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index b1d63ef63..826290ff3 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -43,8 +43,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6CBE", "flag": "0" }, @@ -56,8 +56,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 7, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "7", "script": "Route128_EventScript_1F6D20", "flag": "0" }, @@ -69,8 +69,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_STEVEN" }, @@ -82,8 +82,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" }, @@ -95,8 +95,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_128_MAXIE" }, @@ -108,8 +108,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "Route128_EventScript_1F6DB0", "flag": "0" }, @@ -121,8 +121,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6D99", "flag": "0" }, @@ -134,8 +134,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route128_EventScript_1F6D82", "flag": "0" }, @@ -147,8 +147,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route128_EventScript_1F6DDE", "flag": "0" }, @@ -160,8 +160,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route128_EventScript_1F6DC7", "flag": "0" } diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 310a3e06a..b3e45b227 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 3, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route129_EventScript_1F72EC", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_1F7303", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route129_EventScript_1F7331", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route129_EventScript_1F731A", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route129_EventScript_1F7348", "flag": "0" } diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index d9797e5cc..0a68d442c 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 3, "movement_range_y": 6, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route130_EventScript_1F73BF", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route130_EventScript_1F73D6", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 82, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "82", "script": "BerryTreeScript", "flag": "FLAG_TEMP_11" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route130_EventScript_1F73ED", "flag": "0" } diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index f8d56cc35..3a48042f9 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", "movement_range_x": 5, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_1F7429", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 7, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route131_EventScript_1F7440", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route131_EventScript_1F7457", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 3, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route131_EventScript_1F746E", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route131_EventScript_1F7485", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route131_EventScript_1F74A0", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route131_EventScript_1F74D2", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route131_EventScript_1F74BB", "flag": "0" } diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 719863d2b..ae04ff62d 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1F74EA", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 3, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route132_EventScript_1F7501", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route132_EventScript_291059", "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F752F", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "Route132_EventScript_1F7518", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F7546", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F755D", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F758B", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route132_EventScript_1F7574", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route132_EventScript_291066", "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" } diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 36e7380f7..2a8941e12 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75A3", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75D1", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F75BA", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_291073", "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_291080", "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route133_EventScript_1F75FF", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "Route133_EventScript_1F75E8", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F7616", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route133_EventScript_1F762D", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route133_EventScript_29108D", "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" } diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 350db1e05..1e9123efe 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 3, "movement_range_y": 5, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F7653", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_1F766A", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F7698", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route134_EventScript_1F7681", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route134_EventScript_1F76AF", "flag": "0" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "Route134_EventScript_1F76F4", "flag": "0" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 3, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "Route134_EventScript_1F770B", "flag": "0" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 6, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "Route134_EventScript_1F76DD", "flag": "0" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "Route134_EventScript_1F76C6", "flag": "0" }, @@ -150,8 +150,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route134_EventScript_29109A", "flag": "FLAG_ITEM_ROUTE_134_CARBOS" }, @@ -163,8 +163,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Route134_EventScript_2910A7", "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" } diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 3ca35fc79..d43f7c33b 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E088A", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E085F", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08DA", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08D1", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E08B2", "flag": "0" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0893", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0922", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0938", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0ADD", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E087E", "flag": "0" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_2910DB", "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E094E", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E0DB8", "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_EventScript_1E1236", "flag": "0" } diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index f2490588a..134b9f726 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_215BD4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_CuttersHouse_EventScript_215C0A", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 8bb9a2e2f..7eee74211 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_211261", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_211293", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 01da7a938..9ab864774 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_211886", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 10, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", "flag": "0" } diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 91e8e53fc..0ed5d0b7e 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d0a4e5615..bc016aa2c 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_2150CE", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_1F_EventScript_2150D7", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 0f2de8d53..5c047888e 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_21523D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_21513A", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat1_2F_EventScript_215246", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 9fab521c7..6d10fe9d8 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_215F80", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_1F_EventScript_215F77", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 20ed3c9d4..a7d254e4d 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_215FD8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_2F_EventScript_215FE1", "flag": "0" } diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 8ad260511..2366b5392 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_216117", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Flat2_3F_EventScript_216120", "flag": "0" } diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index ace68d057..3da39df9d 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_212F31", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "RustboroCity_Gym_EventScript_212FE3", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_212FFA", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Gym_EventScript_213028", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RustboroCity_Gym_EventScript_213011", "flag": "0" } diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 598429b22..bc889d66b 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_21593F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House1_EventScript_2159DF", "flag": "0" } diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 7533e995b..b10b2c074 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_215EB4", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House2_EventScript_215EBD", "flag": "0" } diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index c11aa89e3..50b5f1295 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_216191", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_21619A", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_House3_EventScript_2161A3", "flag": "0" } diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 714edcd58..a2a5a846f 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F06", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F7D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F74", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_Mart_EventScript_214F86", "flag": "0" } diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index aabe2785f..b91dd25ac 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", "flag": "0" } diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 9c63421e3..db6388bba 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index fb6944f40..614b123c4 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F5F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F68", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F71", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F7A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F83", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_213F95", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RustboroCity_PokemonSchool_EventScript_214040", "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" } diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 7d3287d04..b873c76c8 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22CE76", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_2907A6", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_291136", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_291143", "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22D0C2", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22D0AF", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_2907A6", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "RusturfTunnel_EventScript_22D1B1", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "RusturfTunnel_EventScript_22CE5F", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" } diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index c8192aaa8..ce6c3d2d0 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C119", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C1A3", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C0D9", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalCorridor_EventScript_23C0E2", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT" } diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 1a7b1fde0..3e678ca8c 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_23C819", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 7, "movement_range_y": 4, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalLowerDeck_EventScript_23C830", "flag": "0" } diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 935c5c33d..8fb4bd05d 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CA49", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_23CA60", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CA77", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SSTidalRooms_EventScript_23CA8E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SSTidalRooms_EventScript_23CAA9", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SSTidalRooms_EventScript_23CAC4", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23CADB", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SSTidalRooms_EventScript_23C9F2", "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" } diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e0202beb9..7c637f0ef 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_23D254", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_23D25D", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_2912C9", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" } diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 6ce7c4d01..8e3337f53 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3C6", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3D8", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_23D3CF", "flag": "0" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -98,8 +98,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_11" }, @@ -111,8 +111,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_14" }, @@ -124,8 +124,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2907A6", "flag": "FLAG_TEMP_12" }, @@ -137,8 +137,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northeast_EventScript_2912E3", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" } diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 910c7cf3c..2d3a1fa49 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_23D24A", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Northwest_EventScript_2912BC", "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" } diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 16acff6dd..db0ba8048 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BE7", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BF0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_RestHouse_EventScript_242BF9", "flag": "0" } diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index c958a1a94..371be2119 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2E5", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2CA", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2D3", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D2DC", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D390", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_South_EventScript_23D3A2", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" } diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index d2e3d7140..3ace62488 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3BD", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3B4", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D3AB", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_2912F0", "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" }, @@ -85,8 +85,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southeast_EventScript_23D399", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" } diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 41cce9e80..5e383a694 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_23D267", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Southwest_EventScript_2912D6", "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" } diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index f24aa0eba..304ebd676 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ScorchedSlab_EventScript_2912AF", "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" } diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index c1f45f1bf..12000c699 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Entrance_EventScript_234485", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT" } diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 3976ff46a..bcac09256 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room1_EventScript_2907A6", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SeafloorCavern_Room1_EventScript_2347EC", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room1_EventScript_234803", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 19b8b0573..3e5d6b127 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2907A6", "flag": "FLAG_TEMP_18" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2907A6", "flag": "FLAG_TEMP_19" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room2_EventScript_2908BA", "flag": "FLAG_TEMP_17" } diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index b7e46a87f..c7a90b42d 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room3_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 6, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "6", "script": "SeafloorCavern_Room3_EventScript_234938", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "SeafloorCavern_Room3_EventScript_23494F", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 02662f017..0638ab4ed 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room4_EventScript_234C9C", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SeafloorCavern_Room4_EventScript_234CB3", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index cfdbd64ef..975fc6a98 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2907A6", "flag": "FLAG_TEMP_16" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room5_EventScript_2908BA", "flag": "FLAG_TEMP_14" } diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index f556c2333..88ea40e3a 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_15" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_18" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_19" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1A" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1B" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room8_EventScript_2908BA", "flag": "FLAG_TEMP_1C" } diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 093d1a83d..fe02ad28b 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SeafloorCavern_Room9_EventScript_291401", "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2" } diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index ee7806e57..8f255972f 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index cdba6e817..ec5d74d2f 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 5dc78c891..07be1610a 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index dfc9c67a8..45762d619 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BlueCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 20411331f..679564ba7 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 800149223..35d5be558 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 08ccc8c32..5424ee85e 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index f6184cee2..de3b4709e 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_BrownCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 309dd3de0..eac0366c1 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 0c2162856..bcbfbd0f2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index ca5f00d6a..00c14d3f3 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 6fe94e6bb..b54974c4c 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_RedCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 7f7dedc1c..38cb8997f 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 0be1b06f1..728226fdc 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index 7104bf5a2..a3c5cdf05 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 15b39293d..9977f6eeb 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Shrub4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index a03a38cde..5d3309cc7 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 484096be1..67deb9a10 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index c1015dd9c..6e4494836 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 297834653..465b1d50b 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_Tree4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 0cc46d97e..a14826a3a 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave1_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 9660114af..97b6baa22 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave2_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index fbc6d6217..581a3479f 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave3_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index d91c2f9a3..3dfa7cc08 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SecretBase_YellowCave4_EventScript_275D64", "flag": "FLAG_DECORATION_0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_1" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_2" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_3" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_4" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_6" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_7" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_8" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_9" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_10" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_11" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_12" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_13" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_DECORATION_14" } diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 477c1c500..1ebb9f555 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", "flag": "0" } diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index fd2e72680..dffef7da9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" } diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index a7c276aa4..04e4ec67f 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" } diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 5c399ed53..92f0fd11a 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", "flag": "0" } diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index e4ad65f52..239effc74 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA", "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL" } diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 4c2340fca..167344e61 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SingleBattleColosseum_EventScript_2774A6", "flag": "0" } diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index dd76c1d32..6a3764aa9 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SkyPillar_Outside_EventScript_2393F8", "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" } diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 6d805d27e..5cb6a1a69 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SkyPillar_Top_EventScript_239722", "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" } diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index fbda27234..ee9f3c379 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -38,8 +38,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCED9", "flag": "0" }, @@ -51,8 +51,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCEF6", "flag": "0" }, @@ -64,8 +64,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCEB8", "flag": "0" }, @@ -77,8 +77,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCF17", "flag": "0" }, @@ -90,8 +90,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD009", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -103,8 +103,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE42", "flag": "0" }, @@ -116,8 +116,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE63", "flag": "0" }, @@ -129,8 +129,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCE84", "flag": "0" }, @@ -142,8 +142,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD353", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, @@ -155,8 +155,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD35C", "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, @@ -168,8 +168,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD1F8", "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" }, @@ -181,8 +181,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFE5", "flag": "0" }, @@ -194,8 +194,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFEE", "flag": "0" }, @@ -207,8 +207,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFF7", "flag": "0" }, @@ -220,8 +220,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD000", "flag": "0" }, @@ -233,8 +233,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFBB", "flag": "0" }, @@ -246,8 +246,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCFDC", "flag": "0" }, @@ -259,8 +259,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD020", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -272,8 +272,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD037", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -285,8 +285,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD198", "flag": "0" }, @@ -298,8 +298,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD16A", "flag": "0" }, @@ -311,8 +311,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD365", "flag": "0" }, @@ -324,8 +324,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCDE4", "flag": "0" }, @@ -337,8 +337,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD1D8", "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" }, @@ -350,8 +350,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DCDBD", "flag": "0" }, @@ -363,8 +363,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD04E", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -376,8 +376,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD065", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -389,8 +389,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD07C", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -402,8 +402,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD093", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -415,8 +415,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD0AA", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -428,8 +428,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD0C1", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -441,8 +441,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD14A", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -454,8 +454,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD153", "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, @@ -467,8 +467,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_EventScript_1DD36E", "flag": "0" }, @@ -480,8 +480,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" } diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index ed9a8866c..e39f04363 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index d5e2d5e37..eea0cac80 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 07af8ad73..45783e2c9 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_2088AA", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A3D", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A7E", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A87", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_BattleTentLobby_EventScript_208A90", "flag": "0" } diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9317db74c..4c9b45683 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CAF1", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CC52", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CC99", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Harbor_EventScript_20CCA2", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW" } diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index b1eed1027..47943e517 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House1_EventScript_209AA5", "flag": "0" } diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 24ae6e67d..a6a686cf7 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_20D9AF", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_House2_EventScript_20D9B8", "flag": "0" } diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index cec96e59f..597abbf06 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC49", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC76", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_Mart_EventScript_20DC7F", "flag": "0" } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index f784a5cde..517647bd1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index dbb46dbfc..6eaecba97 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index eecc72248..3e87ae256 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", "flag": "0" } diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index e12efc0f0..e6ad0518b 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index e41bee0fd..045a0c315 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_28C943", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_209E96", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_20A220", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", "flag": "0" } diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 8497f4212..351431280 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" } diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 025d97f9a..2e57c63fd 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", "flag": "0" } diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 88ca51ff7..76ababed8 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5E8D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5FE2", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E5ED8", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E608E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E60E3", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6017", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6166", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6038", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6411", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E63DB", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6393", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E635D", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E64F2", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E651F", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_EventScript_1E6446", "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" } diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 6c1e4374d..6b8cab149 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_224F44", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Gym_1F_EventScript_225040", "flag": "0" } diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 663d7db84..d378f84e2 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 1, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "1", "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 5, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "5", "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "SootopolisCity_Gym_B1F_EventScript_225D15", "flag": "0" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", "flag": "0" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", "flag": "0" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "SootopolisCity_Gym_B1F_EventScript_225D43", "flag": "0" } diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index b5ecf4e41..2be2adebe 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_22694D", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House1_EventScript_22698E", "flag": "0" } diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ea9d58284..af03fdff5 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House2_EventScript_226A77", "flag": "0" } diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 765803e8a..af925c4c9 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_226B72", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House3_EventScript_226B9B", "flag": "0" } diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 492aac134..db7ffd5d4 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D16", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D1F", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House4_EventScript_226D28", "flag": "0" } diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 24cdafe8b..5e20e33df 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_226E94", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House5_EventScript_226E9D", "flag": "0" } diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index d787c3e67..717590318 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House6_EventScript_226F5C", "flag": "0" } diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index de0464682..4d500fcb0 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_2270CC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_House7_EventScript_2270D5", "flag": "0" } diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index 5f8acc9bb..d7ed8b980 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B", "flag": "0" } diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index bb031b2af..e9b978013 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_226795", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_2267C2", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_Mart_EventScript_2267EC", "flag": "0" } diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index b57eae35c..791b9fdaa 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24", "flag": "0" } diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index fcc77a331..dbb651a44 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index bce2e52bd..90a8dcdad 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", "flag": "0" } diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 32e27dbdf..33308de7b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index a747a48b8..26447c163 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "SouthernIsland_Exterior_EventScript_2429D2", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "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 6d099763a..5fd8354f6 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON" } diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 6d79cb74e..991743d63 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON" } diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 05553e3a0..257c7d1c8 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TradeCenter_EventScript_2774B6", "flag": "0" } diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 731bcf44a..03354b0da 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Elevator_EventScript_26935F", "flag": "0" } diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index db94fb2b2..4b12b1c80 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2681FD", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2681EF", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2683C7", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_2683AC", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Entrance_EventScript_268391", "flag": "0" } diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index d54779a8e..8a623028e 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "TrainerHill_Roof_EventScript_268FB2", "flag": "0" } diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 5497a7ba3..8e7d2c554 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "Underwater_SeafloorCavern_EventScript_2343DC", "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" } diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 175ec3ad7..c42cd362c 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D236", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D204", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D22C", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D222", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D218", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D20E", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1FA", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1F0", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_23D1E6", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" } diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 06e6cc959..3f8f4fe45 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -33,8 +33,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5A8", "flag": "0" }, @@ -46,8 +46,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB575", "flag": "0" }, @@ -59,8 +59,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5BA", "flag": "0" }, @@ -72,8 +72,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_EventScript_1EB5B1", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index e08187b61..2722518eb 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 2e3b9aed1..157745914 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" } diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 2f5190f61..2a5660271 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201873", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", "flag": "0" } diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 3a6785136..955e00a83 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", "flag": "0" } diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index cf6170e8a..9a357b495 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_20335F", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_House_EventScript_203368", "flag": "0" } diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 8ea0e1bf5..4f9b8296e 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_202587", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025BA", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025C3", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_Mart_EventScript_2025CC", "flag": "0" } diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 1c1145565..f9df06d33 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", "flag": "0" } diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index ad2df3d36..bfa6db09e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 10a3996fd..514b2581e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_202913", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_20294E", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VerdanturfTown_WandasHouse_EventScript_20291C", "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" } diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 534d8dd59..65636a49e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_235E73", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_1F_EventScript_235EA1", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_1F_EventScript_235E8A", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_235E2C", "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_291483", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_291490", "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_235E35", "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_1F_EventScript_235ECF", "flag": "0" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_1F_EventScript_235EB8", "flag": "0" } diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 523eddc06..2fde10090 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_13" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_14" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_11" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_12" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_17" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_16" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_1E" }, @@ -113,8 +113,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_19" }, @@ -126,8 +126,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1A" }, @@ -139,8 +139,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1B" }, @@ -152,8 +152,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1C" }, @@ -165,8 +165,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_1D" }, @@ -178,8 +178,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2908BA", "flag": "FLAG_TEMP_1F" }, @@ -191,8 +191,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_B1F_EventScript_2364E5", "flag": "0" }, @@ -204,8 +204,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B1F_EventScript_2364FC", "flag": "0" }, @@ -217,8 +217,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B1F_EventScript_236513", "flag": "0" }, @@ -230,8 +230,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2907A6", "flag": "FLAG_TEMP_15" }, @@ -243,8 +243,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_29149D", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" }, @@ -256,8 +256,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B1F_EventScript_2914AA", "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" }, @@ -269,8 +269,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B1F_EventScript_23652A", "flag": "0" }, @@ -282,8 +282,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 3, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_B1F_EventScript_236541", "flag": "0" } diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 2667155a9..fd9195ed4 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_2368D5", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 4, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_B2F_EventScript_2368EC", "flag": "0" }, @@ -48,8 +48,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236903", "flag": "0" }, @@ -61,8 +61,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_23691A", "flag": "0" }, @@ -74,8 +74,8 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_B2F_EventScript_2914B7", "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" }, @@ -87,8 +87,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236948", "flag": "0" }, @@ -100,8 +100,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": 1, - "trainer_sight_or_berry_tree_id": 2, + "trainer_type": "1", + "trainer_sight_or_berry_tree_id": "2", "script": "VictoryRoad_B2F_EventScript_236931", "flag": "0" } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index d2b9b6802..1cf196fda 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -161,8 +161,8 @@ string generate_map_events_text(Json map_data) { << obj_event["movement_type"].string_value() << ", " << obj_event["movement_range_x"].int_value() << ", " << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].int_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " << obj_event["script"].string_value() << ", " << obj_event["flag"].string_value() << "\n"; }