diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-31 14:22:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 14:22:51 -0400 |
| commit | b1ea2592c30a2e5af547dfc69cef56eb65ae85ba (patch) | |
| tree | a65d2af7712a2913afb72329215f2574d92d1668 /data/maps/Route111 | |
| parent | b33db9b96cda2f03d10b9bfeec4e6ac8bc90da13 (diff) | |
| parent | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (diff) | |
Merge branch 'master' into doc-partymenu
Diffstat (limited to 'data/maps/Route111')
| -rw-r--r-- | data/maps/Route111/map.json | 12 | ||||
| -rw-r--r-- | data/maps/Route111/scripts.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index ef7e29999..0317366cd 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDF6", + "script": "GabbyAndTy_EventScript_TyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDD6", + "script": "GabbyAndTy_EventScript_GabbyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CE96", + "script": "GabbyAndTy_EventScript_GabbyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CEB6", + "script": "GabbyAndTy_EventScript_TyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index fceacdfcc..8121265bb 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -46,7 +46,7 @@ Route111_OnTransition: @ 81F0D87 compare VAR_MIRAGE_TOWER_STATE, 2 call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 - call Route111_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation checktrainerflag TRAINER_VICKY goto_if_lt Route111_EventScript_1F0E26 end |