Merge branch 'master' into sync-ai

1 files changed, 50 insertions, 50 deletions

diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json
index 073a4a17c..36bee2780 100644
--- a/data/maps/Route23/map.json
+++ b/data/maps/Route23/map.json
@@ -34,7 +34,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_16850C",
+      "script": "Route23_EventScript_CascadeBadgeGuard",
       "flag": "0"
     },
     {
@@ -47,7 +47,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_16851D",
+      "script": "Route23_EventScript_ThunderBadgeGuard",
       "flag": "0"
     },
     {
@@ -60,7 +60,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_16852E",
+      "script": "Route23_EventScript_RainbowBadgeGuard",
       "flag": "0"
     },
     {
@@ -73,7 +73,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_16853F",
+      "script": "Route23_EventScript_SoulBadgeGuard",
       "flag": "0"
     },
     {
@@ -86,7 +86,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_168550",
+      "script": "Route23_EventScript_MarshBadgeGuard",
       "flag": "0"
     },
     {
@@ -99,7 +99,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_168561",
+      "script": "Route23_EventScript_VolcanoBadgeGuard",
       "flag": "0"
     },
     {
@@ -112,7 +112,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route23_EventScript_168572",
+      "script": "Route23_EventScript_EarthBadgeGuard",
       "flag": "0"
     }
   ],
@@ -154,7 +154,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 1,
-      "script": "Route23_EventScript_168583"
+      "script": "Route23_EventScript_CascadeBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -163,7 +163,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 2,
-      "script": "Route23_EventScript_168598"
+      "script": "Route23_EventScript_ThunderBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -172,7 +172,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 3,
-      "script": "Route23_EventScript_1685AD"
+      "script": "Route23_EventScript_RainbowBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -181,7 +181,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -190,7 +190,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -199,7 +199,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 6,
-      "script": "Route23_EventScript_1685EC"
+      "script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -208,7 +208,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -217,7 +217,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -226,7 +226,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -235,7 +235,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -244,7 +244,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -253,7 +253,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -262,7 +262,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -271,7 +271,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 7,
-      "script": "Route23_EventScript_168601"
+      "script": "Route23_EventScript_EarthBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -280,7 +280,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 6,
-      "script": "Route23_EventScript_1685EC"
+      "script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -289,7 +289,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 6,
-      "script": "Route23_EventScript_1685EC"
+      "script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -298,7 +298,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 6,
-      "script": "Route23_EventScript_1685EC"
+      "script": "Route23_EventScript_VolcanoBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -307,7 +307,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -316,7 +316,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -325,7 +325,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -334,7 +334,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -343,7 +343,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -352,7 +352,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 5,
-      "script": "Route23_EventScript_1685D7"
+      "script": "Route23_EventScript_MarshBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -361,7 +361,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 2,
-      "script": "Route23_EventScript_168598"
+      "script": "Route23_EventScript_ThunderBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -370,7 +370,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 2,
-      "script": "Route23_EventScript_168598"
+      "script": "Route23_EventScript_ThunderBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -379,7 +379,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 2,
-      "script": "Route23_EventScript_168598"
+      "script": "Route23_EventScript_ThunderBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -388,7 +388,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 3,
-      "script": "Route23_EventScript_1685AD"
+      "script": "Route23_EventScript_RainbowBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -397,7 +397,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 3,
-      "script": "Route23_EventScript_1685AD"
+      "script": "Route23_EventScript_RainbowBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -406,7 +406,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 3,
-      "script": "Route23_EventScript_1685AD"
+      "script": "Route23_EventScript_RainbowBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -415,7 +415,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -424,7 +424,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -433,7 +433,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -442,7 +442,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -451,7 +451,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -460,7 +460,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -469,7 +469,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -478,7 +478,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -487,7 +487,7 @@
       "elevation": 1,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 4,
-      "script": "Route23_EventScript_1685C2"
+      "script": "Route23_EventScript_SoulBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -496,7 +496,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 1,
-      "script": "Route23_EventScript_168583"
+      "script": "Route23_EventScript_CascadeBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -505,7 +505,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 1,
-      "script": "Route23_EventScript_168583"
+      "script": "Route23_EventScript_CascadeBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -514,7 +514,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 1,
-      "script": "Route23_EventScript_168583"
+      "script": "Route23_EventScript_CascadeBadgeGuardTrigger"
     },
     {
       "type": "trigger",
@@ -523,7 +523,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE23",
       "var_value": 1,
-      "script": "Route23_EventScript_168583"
+      "script": "Route23_EventScript_CascadeBadgeGuardTrigger"
     }
   ],
   "bg_events": [
@@ -612,7 +612,7 @@
       "x": 3,
       "y": 31,
       "elevation": 0,
-      "script": "Route23_EventScript_168616"
+      "script": "Route23_EventScript_VictoryRoadGateSign"
     }
   ]
 }