Merge branch 'master' into sync-ai

1 files changed, 44 insertions, 44 deletions

diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc
index b5c8da4f3..fd6c792f0 100644
--- a/data/maps/Route23/scripts.inc
+++ b/data/maps/Route23/scripts.inc
@@ -11,118 +11,118 @@ Route23_OnTransition:: @ 81684F1
 	setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 0
 	end
 
-Route23_EventScript_16850C:: @ 816850C
+Route23_EventScript_CascadeBadgeGuard:: @ 816850C
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 2
-	getstdstring 0, 16
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_CASCADE_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_16851D:: @ 816851D
+Route23_EventScript_ThunderBadgeGuard:: @ 816851D
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 3
-	getstdstring 0, 17
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_THUNDER_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_16852E:: @ 816852E
+Route23_EventScript_RainbowBadgeGuard:: @ 816852E
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 4
-	getstdstring 0, 18
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_RAINBOW_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_16853F:: @ 816853F
+Route23_EventScript_SoulBadgeGuard:: @ 816853F
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 5
-	getstdstring 0, 19
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_SOUL_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_168550:: @ 8168550
+Route23_EventScript_MarshBadgeGuard:: @ 8168550
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 6
-	getstdstring 0, 20
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_MARSH_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_168561:: @ 8168561
+Route23_EventScript_VolcanoBadgeGuard:: @ 8168561
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 7
-	getstdstring 0, 21
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_VOLCANO_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_168572:: @ 8168572
+Route23_EventScript_EarthBadgeGuard:: @ 8168572
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, 8
-	getstdstring 0, 22
-	goto EventScript_1A786C
+	getstdstring 0, STDSTRING_EARTH_BADGE
+	goto Route23_EventScript_BadgeGuard
 	end
 
-Route23_EventScript_168583:: @ 8168583
+Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583
 	lockall
 	setvar VAR_TEMP_1, 2
 	setvar VAR_0x8009, 1
-	getstdstring 0, 16
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_CASCADE_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_168598:: @ 8168598
+Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598
 	lockall
 	setvar VAR_TEMP_1, 3
 	setvar VAR_0x8009, 2
-	getstdstring 0, 17
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_THUNDER_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_1685AD:: @ 81685AD
+Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD
 	lockall
 	setvar VAR_TEMP_1, 4
 	setvar VAR_0x8009, 3
-	getstdstring 0, 18
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_RAINBOW_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_1685C2:: @ 81685C2
+Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2
 	lockall
 	setvar VAR_TEMP_1, 5
 	setvar VAR_0x8009, 4
-	getstdstring 0, 19
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_SOUL_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_1685D7:: @ 81685D7
+Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7
 	lockall
 	setvar VAR_TEMP_1, 6
 	setvar VAR_0x8009, 5
-	getstdstring 0, 20
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_MARSH_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_1685EC:: @ 81685EC
+Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC
 	lockall
 	setvar VAR_TEMP_1, 7
 	setvar VAR_0x8009, 6
-	getstdstring 0, 21
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_VOLCANO_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_168601:: @ 8168601
+Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601
 	lockall
 	setvar VAR_TEMP_1, 8
 	setvar VAR_0x8009, 7
-	getstdstring 0, 22
-	goto EventScript_1A796E
+	getstdstring 0, STDSTRING_EARTH_BADGE
+	goto Route23_EventScript_BadgeGuardTrigger
 	end
 
-Route23_EventScript_168616:: @ 8168616
-	msgbox gUnknown_8188C19, MSGBOX_SIGN
+Route23_EventScript_VictoryRoadGateSign:: @ 8168616
+	msgbox Route23_Text_VictoryRoadGateSign, MSGBOX_SIGN
 	end