From f35a3f73b20aa11c05434b23262e1eeacc62e081 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Oct 2019 19:44:38 -0400 Subject: Document gabby_and_ty.inc --- data/maps/Route120/map.json | 8 ++++---- data/maps/Route120/scripts.inc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/Route120') diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 47f472a3d..8bcfafc72 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE76", + "script": "GabbyAndTy_EventScript_TyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE56", + "script": "GabbyAndTy_EventScript_GabbyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0629d8f0d..562416c1d 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -61,7 +61,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8 return Route120_OnTransition: @ 81F54CD - call Route120_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation call Route120_EventScript_1F54D8 end -- cgit v1.2.3