diff options
| author | Sierraffinity <sierra@domoreaweso.me> | 2020-05-04 20:54:27 -0700 |
|---|---|---|
| committer | Sierraffinity <sierra@domoreaweso.me> | 2020-05-04 20:54:27 -0700 |
| commit | a1244aa5dd4c7519ba6c2dcba5796eec2eba1c90 (patch) | |
| tree | 76cd7fa5a9ed806e19221e8d9a11337355f074f5 /data/maps/BattlePyramidSquare13 | |
| parent | 072a98ca9aea8bfea7edc65f0a4a230974362b96 (diff) | |
| parent | b3b99b52ca978104ebed318f1d238fc97892836a (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/BattlePyramidSquare13')
| -rw-r--r-- | data/maps/BattlePyramidSquare13/map.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 7a5df9386..d6e55d849 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "BattlePyramid_TrainerBattle", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattlePyramid_FindItemBall", "flag": "0" |