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/FallarborTown/map.json | |
| parent | 072a98ca9aea8bfea7edc65f0a4a230974362b96 (diff) | |
| parent | b3b99b52ca978104ebed318f1d238fc97892836a (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/FallarborTown/map.json')
| -rw-r--r-- | data/maps/FallarborTown/map.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 191b23200..54809f977 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", @@ -33,7 +33,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_Girl", "flag": "0" @@ -46,7 +46,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_ExpertM", "flag": "0" @@ -59,7 +59,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_Gentleman", "flag": "0" @@ -72,7 +72,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FallarborTown_EventScript_Azurill", "flag": "FLAG_HIDE_FALLARBOR_AZURILL" |