summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/Route111/map.json12
-rw-r--r--data/maps/Route111/scripts.inc2
-rw-r--r--data/maps/Route118/map.json12
-rw-r--r--data/maps/Route118/scripts.inc2
-rw-r--r--data/maps/Route120/map.json8
-rw-r--r--data/maps/Route120/scripts.inc2
6 files changed, 19 insertions, 19 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
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index e7737bf1e..40a988bad 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -92,7 +92,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CE16",
+ "script": "GabbyAndTy_EventScript_GabbyBattle2",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
},
{
@@ -105,7 +105,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CE36",
+ "script": "GabbyAndTy_EventScript_TyBattle2",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
},
{
@@ -131,7 +131,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CED6",
+ "script": "Route118_EventScript_GabbyBattle5",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
},
{
@@ -144,7 +144,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CEF6",
+ "script": "Route118_EventScript_TyBattle5",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
},
{
@@ -157,7 +157,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CF16",
+ "script": "GabbyAndTy_EventScript_GabbyBattle6",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
},
{
@@ -170,7 +170,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_28CF36",
+ "script": "GabbyAndTy_EventScript_TyBattle6",
"flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
},
{
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 661bd938c..38b231111 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -5,7 +5,7 @@ Route118_MapScripts:: @ 81F3DBC
.byte 0
Route118_OnTransition: @ 81F3DCC
- call Route118_EventScript_28CCC7
+ call GabbyAndTy_EventScript_UpdateLocation
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 18:07:39 +0000