summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/maps/Route10/map.json18
-rw-r--r--data/maps/Route10/scripts.inc14
-rw-r--r--data/maps/Route10/text.inc42
-rw-r--r--data/maps/Route10_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/Route10_PokemonCenter_1F/scripts.inc42
-rw-r--r--data/maps/Route10_PokemonCenter_1F/text.inc14
-rw-r--r--data/maps/Route11/map.json22
-rw-r--r--data/maps/Route11/scripts.inc4
-rw-r--r--data/maps/Route11/text.inc62
-rw-r--r--data/maps/Route11_EastEntrance_1F/map.json4
-rw-r--r--data/maps/Route11_EastEntrance_1F/scripts.inc8
-rw-r--r--data/maps/Route11_EastEntrance_1F/text.inc7
-rw-r--r--data/maps/Route11_EastEntrance_2F/map.json8
-rw-r--r--data/maps/Route11_EastEntrance_2F/scripts.inc58
-rw-r--r--data/maps/Route11_EastEntrance_2F/text.inc14
-rw-r--r--data/maps/Route12/map.json18
-rw-r--r--data/maps/Route12/text.inc75
-rw-r--r--data/maps/Route12_FishingHouse/map.json4
-rw-r--r--data/maps/Route12_FishingHouse/scripts.inc90
-rw-r--r--data/maps/Route12_FishingHouse/text.inc30
-rw-r--r--data/maps/Route12_NorthEntrance_1F/map.json2
-rw-r--r--data/maps/Route12_NorthEntrance_1F/scripts.inc4
-rw-r--r--data/maps/Route12_NorthEntrance_1F/text.inc2
-rw-r--r--data/maps/Route12_NorthEntrance_2F/map.json6
-rw-r--r--data/maps/Route12_NorthEntrance_2F/scripts.inc38
-rw-r--r--data/maps/Route12_NorthEntrance_2F/text.inc15
-rw-r--r--data/maps/Route13/map.json26
-rw-r--r--data/maps/Route13/scripts.inc12
-rw-r--r--data/maps/Route13/text.inc100
-rw-r--r--data/maps/Route14/map.json26
-rw-r--r--data/maps/Route14/scripts.inc4
-rw-r--r--data/maps/Route14/text.inc92
-rw-r--r--data/maps/Route15/text.inc63
-rw-r--r--data/maps/Route16/text.inc66
-rw-r--r--data/maps/Route17/text.inc34
-rw-r--r--data/maps/Route19/text.inc35
-rw-r--r--data/maps/Route20/text.inc41
-rw-r--r--data/maps/Route21_North/text.inc6
-rw-r--r--data/scripts/trainers.inc1126
-rw-r--r--data/text/trainers.inc94
40 files changed, 1168 insertions, 1168 deletions
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index fef96485a..a7f896695 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1A9FE5",
+ "script": "Route10_EventScript_Carol",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route10_EventScript_1AA09F",
+ "script": "Route10_EventScript_Clark",
"flag": "0"
},
{
@@ -60,7 +60,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1AA061",
+ "script": "Route10_EventScript_Herman",
"flag": "0"
},
{
@@ -73,7 +73,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1AA0DD",
+ "script": "Route10_EventScript_Trent",
"flag": "0"
},
{
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route10_EventScript_1AA023",
+ "script": "Route10_EventScript_Mark",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route10_EventScript_1A9FA7",
+ "script": "Route10_EventScript_Heidi",
"flag": "0"
},
{
@@ -199,21 +199,21 @@
"x": 15,
"y": 59,
"elevation": 0,
- "script": "Route10_EventScript_167FE4"
+ "script": "Route10_EventScript_SouthRockTunnelSign"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 42,
"elevation": 0,
- "script": "Route10_EventScript_167FED"
+ "script": "Route10_EventScript_PowerPlantSign"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 21,
"elevation": 0,
- "script": "Route10_EventScript_167FDB"
+ "script": "Route10_EventScript_NorthRockTunnelSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc
index 7fb5d64cd..93694dc8a 100644
--- a/data/maps/Route10/scripts.inc
+++ b/data/maps/Route10/scripts.inc
@@ -1,17 +1,17 @@
Route10_MapScripts:: @ 8167FD9
.byte 0
-Route10_EventScript_167FDA:: @ 8167FDA
+Route10_EventScript_Unused:: @ 8167FDA
end
-Route10_EventScript_167FDB:: @ 8167FDB
- msgbox gUnknown_8184EC5, MSGBOX_SIGN
+Route10_EventScript_NorthRockTunnelSign:: @ 8167FDB
+ msgbox Route10_Text_RockTunnelDetourToLavender, MSGBOX_SIGN
end
-Route10_EventScript_167FE4:: @ 8167FE4
- msgbox gUnknown_8184EE9, MSGBOX_SIGN
+Route10_EventScript_SouthRockTunnelSign:: @ 8167FE4
+ msgbox Route10_Text_RockTunnel, MSGBOX_SIGN
end
-Route10_EventScript_167FED:: @ 8167FED
- msgbox gUnknown_8184EF5, MSGBOX_SIGN
+Route10_EventScript_PowerPlantSign:: @ 8167FED
+ msgbox Route10_Text_PowerPlant, MSGBOX_SIGN
end
diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc
index af45c8923..5a2d48efb 100644
--- a/data/maps/Route10/text.inc
+++ b/data/maps/Route10/text.inc
@@ -1,86 +1,86 @@
-Text_184B8A:: @ 8184B8A
+Route10_Text_MarkIntro:: @ 8184B8A
.string "Wow, you came all the way here?\n"
.string "Maybe you're a POKéMANIAC, too?\l"
.string "Want to see my collection?$"
-Text_184BE5:: @ 8184BE5
+Route10_Text_MarkDefeat:: @ 8184BE5
.string "Humph.\n"
.string "I'm not angry!$"
-Text_184BFB:: @ 8184BFB
+Route10_Text_MarkPostBattle:: @ 8184BFB
.string "I have more rare POKéMON at home!$"
-Text_184C1D:: @ 8184C1D
+Route10_Text_ClarkIntro:: @ 8184C1D
.string "Ha-hahah-ah-ha!$"
-Text_184C2D:: @ 8184C2D
+Route10_Text_ClarkDefeat:: @ 8184C2D
.string "Ha-haha!\n"
.string "Not laughing!\l"
.string "Ha-hay fever! Haha-ha-choo!$"
-Text_184C60:: @ 8184C60
+Route10_Text_ClarkPostBattle:: @ 8184C60
.string "Haha-ha-choo!\n"
.string "Ha-choo!\l"
.string "Snort! Snivel!$"
-Text_184C86:: @ 8184C86
+Route10_Text_HermanIntro:: @ 8184C86
.string "Hi, kid!\n"
.string "Want to see my POKéMON?$"
-Text_184CA7:: @ 8184CA7
+Route10_Text_HermanDefeat:: @ 8184CA7
.string "Oh, no!\n"
.string "My POKéMON!$"
-Text_184CBB:: @ 8184CBB
+Route10_Text_HermanPostBattle:: @ 8184CBB
.string "I don't like you.\n"
.string "I don't like anyone better than me!$"
-Text_184CF1:: @ 8184CF1
+Route10_Text_HeidiIntro:: @ 8184CF1
.string "I've been out at a POKéMON GYM\n"
.string "a few times.\p"
.string "…But I always lose.$"
-Text_184D31:: @ 8184D31
+Route10_Text_HeidiDefeat:: @ 8184D31
.string "Ohh!\n"
.string "After all my training!$"
-Text_184D4D:: @ 8184D4D
+Route10_Text_HeidiPostBattle:: @ 8184D4D
.string "I noticed some POKéMANIACS\n"
.string "prowling around.\p"
.string "Can you imagine? Them?\n"
.string "Up here in the mountains?$"
-Text_184DAA:: @ 8184DAA
+Route10_Text_TrentIntro:: @ 8184DAA
.string "Ah!\n"
.string "This mountain air is delicious!$"
-Text_184DCE:: @ 8184DCE
+Route10_Text_TrentDefeat:: @ 8184DCE
.string "That cleared my head!$"
-Text_184DE4:: @ 8184DE4
+Route10_Text_TrentPostBattle:: @ 8184DE4
.string "I feel bloated on mountain air!$"
-Text_184E04:: @ 8184E04
+Route10_Text_CarolIntro:: @ 8184E04
.string "I'm feeling a bit faint.\n"
.string "I haven't hiked in some time.$"
-Text_184E3B:: @ 8184E3B
+Route10_Text_CarolDefeat:: @ 8184E3B
.string "I'm too tired.\n"
.string "I wasn't up for it.$"
-Text_184E5E:: @ 8184E5E
+Route10_Text_CarolPostBattle:: @ 8184E5E
.string "The POKéMON here in the mountains\n"
.string "are so chunky…\p"
.string "I wish there were pink POKéMON\n"
.string "with a floral pattern!$"
-gUnknown_8184EC5:: @ 8184EC5
+Route10_Text_RockTunnelDetourToLavender:: @ 8184EC5
.string "ROCK TUNNEL\n"
.string "Detour to LAVENDER TOWN$"
-gUnknown_8184EE9:: @ 8184EE9
+Route10_Text_RockTunnel:: @ 8184EE9
.string "ROCK TUNNEL$"
-gUnknown_8184EF5:: @ 8184EF5
+Route10_Text_PowerPlant:: @ 8184EF5
.string "POWER PLANT$"
diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
index dc1543ef0..d089e5544 100644
--- a/data/maps/Route10_PokemonCenter_1F/map.json
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route10_PokemonCenter_1F_EventScript_16FC41",
+ "script": "Route10_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route10_PokemonCenter_1F_EventScript_16FC53",
+ "script": "Route10_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route10_PokemonCenter_1F_EventScript_16FC4A",
+ "script": "Route10_PokemonCenter_1F_EventScript_FatMan",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route10_PokemonCenter_1F_EventScript_16FC5C",
+ "script": "Route10_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route10_PokemonCenter_1F_EventScript_16FC65",
+ "script": "Route10_PokemonCenter_1F_EventScript_Aide",
"flag": "0"
}
],
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index 56e0b448e..a4d477a4b 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -1,3 +1,5 @@
+.equ REQUIRED_OWNED_MONS, 20
+
Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -8,55 +10,55 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A
setrespawn SPAWN_ROUTE10
end
-Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41
+Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
-Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A
- msgbox gUnknown_819E59D, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A
+ msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC
end
-Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53
- msgbox gUnknown_819E523, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53
+ msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC
end
-Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C
- msgbox gUnknown_819E5D2, MSGBOX_NPC
+Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C
+ msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC
end
-Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
+Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
lock
faceplayer
- call EventScript_16FCF1
- goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
- msgbox gUnknown_819E5FB, MSGBOX_YESNO
+ call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
+ goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone
+ msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
- call EventScript_16FCF1
- compare VAR_0x8006, 20
+ call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
+ compare VAR_0x8006, REQUIRED_OWNED_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
- msgbox gUnknown_819E733
+ msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo
checkitemspace ITEM_EVERSTONE, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
- giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
+ giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
- msgbox gUnknown_819E7AF
+ msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
release
end
-EventScript_16FCE7:: @ 816FCE7
- msgbox gUnknown_819E7AF
+Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7
+ msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
release
end
-EventScript_16FCF1:: @ 816FCF1
- getnumberstring 0, 20
+Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1
+ getnumberstring 0, REQUIRED_OWNED_MONS
getitemname 1, ITEM_EVERSTONE
return
diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc
index 3360854fe..7c63407ae 100644
--- a/data/maps/Route10_PokemonCenter_1F/text.inc
+++ b/data/maps/Route10_PokemonCenter_1F/text.inc
@@ -1,18 +1,18 @@
-gUnknown_819E523:: @ 819E523
+Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523
.string "The types of POKéMON match up\n"
.string "differently with each other.\p"
.string "Every type is stronger than some\n"
.string "types and weaker than others.$"
-gUnknown_819E59D:: @ 819E59D
+Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D
.string "A NUGGET is totally useless.\n"
.string "So I sold it for ¥5000.$"
-gUnknown_819E5D2:: @ 819E5D2
+Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2
.string "I heard that ghosts haunt\n"
.string "LAVENDER TOWN.$"
-gUnknown_819E5FB:: @ 819E5FB
+Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB
.string "Oh… {PLAYER}!\n"
.string "I've been looking for you!\p"
.string "It's me, one of the ever-present\n"
@@ -26,17 +26,17 @@ gUnknown_819E5FB:: @ 819E5FB
.string "Have you gathered data on at least\n"
.string "twenty kinds of POKéMON?$"
-gUnknown_819E733:: @ 819E733
+Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
-gUnknown_819E786:: @ 819E786
+Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786
.string "{PLAYER} received the EVERSTONE\n"
.string "from the AIDE.$"
-gUnknown_819E7AF:: @ 819E7AF
+Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF
.string "Making POKéMON evolve certainly\n"
.string "can add to the POKéDEX.\p"
.string "However, at times, you may not\n"
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index 7cdaa105b..eeab00960 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route11_EventScript_1A9B0D",
+ "script": "Route11_EventScript_Eddie",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9C81",
+ "script": "Route11_EventScript_Hugo",
"flag": "0"
},
{
@@ -60,7 +60,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route11_EventScript_1A9B4B",
+ "script": "Route11_EventScript_Dillon",
"flag": "0"
},
{
@@ -73,7 +73,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9BC7",
+ "script": "Route11_EventScript_Dave",
"flag": "0"
},
{
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9CBF",
+ "script": "Route11_EventScript_Jasper",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9D3B",
+ "script": "Route11_EventScript_Darian",
"flag": "0"
},
{
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route11_EventScript_1A9C05",
+ "script": "Route11_EventScript_Braxton",
"flag": "0"
},
{
@@ -125,7 +125,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9B89",
+ "script": "Route11_EventScript_Yasu",
"flag": "0"
},
{
@@ -138,7 +138,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route11_EventScript_1A9CFD",
+ "script": "Route11_EventScript_Dirk",
"flag": "0"
},
{
@@ -151,7 +151,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route11_EventScript_1A9C43",
+ "script": "Route11_EventScript_Bernie",
"flag": "0"
},
{
@@ -224,7 +224,7 @@
"x": 3,
"y": 7,
"elevation": 3,
- "script": "Route11_EventScript_167FF7"
+ "script": "Route11_EventScript_DiglettsCaveSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc
index 11f052030..821b8256f 100644
--- a/data/maps/Route11/scripts.inc
+++ b/data/maps/Route11/scripts.inc
@@ -1,6 +1,6 @@
Route11_MapScripts:: @ 8167FF6
.byte 0
-Route11_EventScript_167FF7:: @ 8167FF7
- msgbox gUnknown_8185308, MSGBOX_SIGN
+Route11_EventScript_DiglettsCaveSign:: @ 8167FF7
+ msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN
end
diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc
index 19515d010..2f7c7fc6d 100644
--- a/data/maps/Route11/text.inc
+++ b/data/maps/Route11/text.inc
@@ -1,113 +1,113 @@
-Text_184F01:: @ 8184F01
+Route11_Text_HugoIntro:: @ 8184F01
.string "Win, lose, or draw!$"
-Text_184F15:: @ 8184F15
+Route11_Text_HugoDefeat:: @ 8184F15
.string "Atcha!\n"
.string "Didn't go my way!$"
-Text_184F2E:: @ 8184F2E
+Route11_Text_HugoPostBattle:: @ 8184F2E
.string "POKéMON is life!\n"
.string "And to live is to play games!$"
-Text_184F5D:: @ 8184F5D
+Route11_Text_JasperIntro:: @ 8184F5D
.string "Competition!\n"
.string "I can't get enough!$"
-Text_184F7E:: @ 8184F7E
+Route11_Text_JasperDefeat:: @ 8184F7E
.string "I had a chance!$"
-Text_184F8E:: @ 8184F8E
+Route11_Text_JasperPostBattle:: @ 8184F8E
.string "You can't be a coward in the world\n"
.string "of POKéMON!$"
-Text_184FBD:: @ 8184FBD
+Route11_Text_EddieIntro:: @ 8184FBD
.string "Let's go, but don't cheat!$"
-Text_184FD8:: @ 8184FD8
+Route11_Text_EddieDefeat:: @ 8184FD8
.string "Huh?\n"
.string "That's not right!$"
-Text_184FEF:: @ 8184FEF
+Route11_Text_EddiePostBattle:: @ 8184FEF
.string "I did my best.\n"
.string "I have no regrets.$"
-Text_185011:: @ 8185011
+Route11_Text_BraxtonIntro:: @ 8185011
.string "Careful!\n"
.string "I'm laying down some cables!$"
-Text_185037:: @ 8185037
+Route11_Text_BraxtonDefeat:: @ 8185037
.string "That was electric!$"
-Text_18504A:: @ 818504A
+Route11_Text_BraxtonPostBattle:: @ 818504A
.string "Spread the word to save energy!$"
-Text_18506A:: @ 818506A
+Route11_Text_DillonIntro:: @ 818506A
.string "I just became a TRAINER.\n"
.string "But, I think I can win.$"
-Text_18509B:: @ 818509B
+Route11_Text_DillonDefeat:: @ 818509B
.string "My POKéMON couldn't win…\n"
.string "Haven't they grown enough?$"
-Text_1850CF:: @ 81850CF
+Route11_Text_DillonPostBattle:: @ 81850CF
.string "What now?\n"
.string "Leave me alone!$"
-Text_1850E9:: @ 81850E9
+Route11_Text_DirkIntro:: @ 81850E9
.string "Fwahaha!\n"
.string "I have never lost!$"
-Text_185105:: @ 8185105
+Route11_Text_DirkDefeat:: @ 8185105
.string "My first loss!$"
-Text_185114:: @ 8185114
+Route11_Text_DirkPostBattle:: @ 8185114
.string "You were just lucky, that's all.$"
-Text_185135:: @ 8185135
+Route11_Text_DarianIntro:: @ 8185135
.string "I have never won before…$"
-Text_18514E:: @ 818514E
+Route11_Text_DarianDefeat:: @ 818514E
.string "I saw this coming…$"
-Text_185161:: @ 8185161
+Route11_Text_DarianPostBattle:: @ 8185161
.string "I was unlucky, as always.$"
-Text_18517B:: @ 818517B
+Route11_Text_YasuIntro:: @ 818517B
.string "I'm the best in my class.\n"
.string "I train every morning.$"
-Text_1851AC:: @ 81851AC
+Route11_Text_YasuDefeat:: @ 81851AC
.string "Darn!\n"
.string "My POKéMON need to be stronger!$"
-Text_1851D2:: @ 81851D2
+Route11_Text_YasuPostBattle:: @ 81851D2
.string "There's a fat POKéMON that comes\n"
.string "down from the mountains.\p"
.string "I bet it'd be strong if you can\n"
.string "catch it.$"
-Text_185236:: @ 8185236
+Route11_Text_BernieIntro:: @ 8185236
.string "Watch out for live wires!$"
-Text_185250:: @ 8185250
+Route11_Text_BernieDefeat:: @ 8185250
.string "Whoa!\n"
.string "You spark plug!$"
-Text_185266:: @ 8185266
+Route11_Text_BerniePostBattle:: @ 8185266
.string "Well, better get back to work.$"
-Text_185285:: @ 8185285
+Route11_Text_DaveIntro:: @ 8185285
.string "I raised my POKéMON carefully.\n"
.string "They should be ready by now!$"
-Text_1852C1:: @ 81852C1
+Route11_Text_DaveDefeat:: @ 81852C1
.string "Bye-bye!\n"
.string "Thank you, and good-bye!$"
-Text_1852E3:: @ 81852E3
+Route11_Text_DavePostBattle:: @ 81852E3
.string "Tch…\n"
.string "I better go find stronger ones!$"
-gUnknown_8185308:: @ 8185308
+Route11_Text_DiglettsCave:: @ 8185308
.string "DIGLETT'S CAVE$"
diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json
index 21d3b454f..bce3d1114 100644
--- a/data/maps/Route11_EastEntrance_1F/map.json
+++ b/data/maps/Route11_EastEntrance_1F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route11_EastEntrance_1F_EventScript_16FD22",
+ "script": "Route11_EastEntrance_1F_EventScript_TopGuard",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route11_EastEntrance_1F_EventScript_16FD2B",
+ "script": "Route11_EastEntrance_1F_EventScript_BottomGuard",
"flag": "0"
}
],
diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc
index 0a2f2cb75..e8097b62a 100644
--- a/data/maps/Route11_EastEntrance_1F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_1F/scripts.inc
@@ -1,10 +1,10 @@
Route11_EastEntrance_1F_MapScripts:: @ 816FD21
.byte 0
-Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22
- msgbox gUnknown_819E8A6, MSGBOX_NPC
+Route11_EastEntrance_1F_EventScript_TopGuard:: @ 816FD22
+ msgbox Route11_EastEntrance_1F_Text_ManInLavenderRatesNames, MSGBOX_NPC
end
-Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B
- msgbox gUnknown_819E97B, MSGBOX_NPC
+Route11_EastEntrance_1F_EventScript_BottomGuard:: @ 816FD2B
+ msgbox Route11_EastEntrance_1F_Text_RockTunnelToReachLavender, MSGBOX_NPC
end
diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc
index 335e7e3e9..de5965bcf 100644
--- a/data/maps/Route11_EastEntrance_1F/text.inc
+++ b/data/maps/Route11_EastEntrance_1F/text.inc
@@ -1,8 +1,9 @@
-Text_19E890:: @ 819E890
+@ Unclear where this is originally from
+Route11_EastEntrance_1F_Text_BagIsFull:: @ 819E890
.string "{PLAYER}{KUN}の バッグ\n"
.string "いっぱい みたい だね$"
-gUnknown_819E8A6:: @ 819E8A6
+Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: @ 819E8A6
.string "Don't you think it's hard to think\n"
.string "up good names for POKéMON?\p"
.string "Especially if you've caught a\n"
@@ -12,7 +13,7 @@ gUnknown_819E8A6:: @ 819E8A6
.string "He can even help you rename your\n"
.string "POKéMON, too.$"
-gUnknown_819E97B:: @ 819E97B
+Route11_EastEntrance_1F_Text_RockTunnelToReachLavender:: @ 819E97B
.string "If you're aiming to reach LAVENDER\n"
.string "TOWN, take ROCK TUNNEL.\p"
.string "You can get to ROCK TUNNEL from\n"
diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json
index d7c8f1f5b..b384b9655 100644
--- a/data/maps/Route11_EastEntrance_2F/map.json
+++ b/data/maps/Route11_EastEntrance_2F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route11_EastEntrance_2F_EventScript_16FD5C",
+ "script": "Route11_EastEntrance_2F_EventScript_Turner",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route11_EastEntrance_2F_EventScript_16FDD8",
+ "script": "Route11_EastEntrance_2F_EventScript_Aide",
"flag": "0"
}
],
@@ -56,14 +56,14 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "Route11_EastEntrance_2F_EventScript_16FD35"
+ "script": "Route11_EastEntrance_2F_EventScript_LeftBinoculars"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 1,
"elevation": 0,
- "script": "Route11_EastEntrance_2F_EventScript_16FD53"
+ "script": "Route11_EastEntrance_2F_EventScript_RightBinoculars"
}
]
}
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
index 91a6d20bd..b8b6be3e7 100644
--- a/data/maps/Route11_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -1,89 +1,91 @@
+.equ REQUIRED_CAUGHT_MONS, 30
+
Route11_EastEntrance_2F_MapScripts:: @ 816FD34
.byte 0
-Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35
+Route11_EastEntrance_2F_EventScript_LeftBinoculars:: @ 816FD35
lockall
- goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49
- msgbox gUnknown_819EC8A
+ goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone
+ msgbox Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad
releaseall
end
-EventScript_16FD49:: @ 816FD49
- msgbox gUnknown_819ECD9
+Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone:: @ 816FD49
+ msgbox Route11_EastEntrance_2F_Text_WhatABreathtakingView
releaseall
end
-Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53
- msgbox gUnknown_819ED1F, MSGBOX_SIGN
+Route11_EastEntrance_2F_EventScript_RightBinoculars:: @ 816FD53
+ msgbox Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender, MSGBOX_SIGN
end
-Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
+Route11_EastEntrance_2F_EventScript_Turner:: @ 816FD5C
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_NIDORINOA
call EventScript_GetInGameTradeSpeciesInfo
- goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE
+ goto_if_set FLAG_DID_NINA_TRADE, Route11_EastEntrance_2F_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_16FDB6
+ goto_if_eq Route11_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
- goto_if_ge EventScript_16FDB6
+ goto_if_ge Route11_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
- goto_if_ne EventScript_16FDC0
+ goto_if_ne Route11_EastEntrance_2F_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_NINA_TRADE
release
end
-EventScript_16FDB6:: @ 816FDB6
+Route11_EastEntrance_2F_EventScript_DeclineTrade:: @ 816FDB6
msgbox Trade_Text_AwwOhWell
release
end
-EventScript_16FDC0:: @ 816FDC0
+Route11_EastEntrance_2F_EventScript_NotRequestedMon:: @ 816FDC0
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end
-EventScript_16FDCE:: @ 816FDCE
+Route11_EastEntrance_2F_EventScript_AlreadyTraded:: @ 816FDCE
msgbox Trade_Text_IsntMyOldMonGreat
release
end
-Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
+Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8
lock
faceplayer
- call EventScript_16FE64
- goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A
- msgbox gUnknown_819E9E5, MSGBOX_YESNO
+ call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
+ goto_if_set FLAG_GOT_ITEMFINDER, Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder
+ msgbox Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
- call EventScript_16FE64
- compare VAR_0x8006, 30
+ call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo
+ compare VAR_0x8006, REQUIRED_CAUGHT_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
- msgbox gUnknown_819EAE4
+ msgbox Route11_EastEntrance_2F_Text_GreatHereYouGo
checkitemspace ITEM_ITEMFINDER, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
- giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
+ giveitem_msg Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide, ITEM_ITEMFINDER
setflag FLAG_GOT_ITEMFINDER
- msgbox gUnknown_819EB59
+ msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder
release
end
-EventScript_16FE5A:: @ 816FE5A
- msgbox gUnknown_819EB59
+Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder:: @ 816FE5A
+ msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder
release
end
-EventScript_16FE64:: @ 816FE64
- getnumberstring 0, 30
+Route11_EastEntrance_2F_EventScript_GetAideRequestInfo:: @ 816FE64
+ getnumberstring 0, REQUIRED_CAUGHT_MONS
getitemname 1, ITEM_ITEMFINDER
return
diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc
index aa693a495..66e871199 100644
--- a/data/maps/Route11_EastEntrance_2F/text.inc
+++ b/data/maps/Route11_EastEntrance_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819E9E5:: @ 819E9E5
+Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: @ 819E9E5
.string "Hi! Remember me?\n"
.string "I'm one of PROF. OAK's AIDES.\p"
.string "If your POKéDEX has complete data\n"
@@ -10,17 +10,17 @@ gUnknown_819E9E5:: @ 819E9E5
.string "Have you gathered data on at least\n"
.string "{STR_VAR_1} kinds of POKéMON?$"
-gUnknown_819EAE4:: @ 819EAE4
+Route11_EastEntrance_2F_Text_GreatHereYouGo:: @ 819EAE4
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
-gUnknown_819EB37:: @ 819EB37
+Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide:: @ 819EB37
.string "{PLAYER} received the {STR_VAR_2}\n"
.string "from the AIDE.$"
-gUnknown_819EB59:: @ 819EB59
+Route11_EastEntrance_2F_Text_ExplainItemfinder:: @ 819EB59
.string "There are items on the ground that\n"
.string "may be hidden from view.\p"
.string "Use the ITEMFINDER to detect any\n"
@@ -32,17 +32,17 @@ gUnknown_819EB59:: @ 819EB59
.string "Use it to get your bearings, then\n"
.string "search the suspect area by hand.$"
-gUnknown_819EC8A:: @ 819EC8A
+Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad:: @ 819EC8A
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "A big POKéMON is asleep on a road!$"
-gUnknown_819ECD9:: @ 819ECD9
+Route11_EastEntrance_2F_Text_WhatABreathtakingView:: @ 819ECD9
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "What a breathtaking view!$"
-gUnknown_819ED1F:: @ 819ED1F
+Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender:: @ 819ED1F
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "To get to LAVENDER TOWN from\n"
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 09e49160b..9eae7ca01 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -39,7 +39,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA451",
+ "script": "Route12_EventScript_Ned",
"flag": "0"
},
{
@@ -52,7 +52,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA48F",
+ "script": "Route12_EventScript_Chip",
"flag": "0"
},
{
@@ -65,7 +65,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route12_EventScript_1AA4CD",
+ "script": "Route12_EventScript_Hank",
"flag": "0"
},
{
@@ -78,7 +78,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA50B",
+ "script": "Route12_EventScript_Elliot",
"flag": "0"
},
{
@@ -104,7 +104,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA587",
+ "script": "Route12_EventScript_Luca",
"flag": "0"
},
{
@@ -117,7 +117,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA5C5",
+ "script": "Route12_EventScript_Justin",
"flag": "0"
},
{
@@ -130,7 +130,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route12_EventScript_1AA549",
+ "script": "Route12_EventScript_Andrew",
"flag": "0"
},
{
@@ -182,7 +182,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_EventScript_1AA649",
+ "script": "Route12_EventScript_Gia",
"flag": "0"
},
{
@@ -195,7 +195,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_EventScript_1AA603",
+ "script": "Route12_EventScript_Jes",
"flag": "0"
},
{
diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc
index 06371bf5c..9c984cc47 100644
--- a/data/maps/Route12/text.inc
+++ b/data/maps/Route12/text.inc
@@ -17,87 +17,87 @@ Text_WantToUsePokeFlute:: @ 81853CC
Text_PlayedPokeFlute:: @ 81853E8
.string "{PLAYER} played the POKé FLUTE.$"
-Text_185402:: @ 8185402
+Route12_Text_NedIntro:: @ 8185402
.string "Yeah!\n"
.string "I got a bite here!$"
-Text_18541B:: @ 818541B
+Route12_Text_NedDefeat:: @ 818541B
.string "Tch!\n"
.string "Just a small fry…$"
-Text_185432:: @ 8185432
+Route12_Text_NedPostBattle:: @ 8185432
.string "Hang on!\n"
.string "My line's snagged!$"
-Text_18544E:: @ 818544E
+Route12_Text_ChipIntro:: @ 818544E
.string "Be patient.\n"
.string "Fishing is a waiting game.$"
-Text_185475:: @ 8185475
+Route12_Text_ChipDefeat:: @ 8185475
.string "That one got away!$"
-Text_185488:: @ 8185488
+Route12_Text_ChipPostBattle:: @ 8185488
.string "With a better ROD, I could catch\n"
.string "better POKéMON…$"
-Text_1854B9:: @ 81854B9
+Route12_Text_JustinIntro:: @ 81854B9
.string "I'm searching for a MOON STONE.\n"
.string "Have you found one?$"
-Text_1854ED:: @ 81854ED
+Route12_Text_JustinDefeat:: @ 81854ED
.string "Oww!$"
-Text_1854F2:: @ 81854F2
+Route12_Text_JustinPostBattle:: @ 81854F2
.string "I could have made my POKéMON\n"
.string "evolve with a MOON STONE.\p"
.string "I would have won then, I bet.$"
-Text_185547:: @ 8185547
+Route12_Text_LucaIntro:: @ 8185547
.string "Electricity is my specialty.\p"
.string "I don't know a thing about POKéMON\n"
.string "of the sea, though.$"
-Text_18559B:: @ 818559B
+Route12_Text_LucaDefeat:: @ 818559B
.string "Unplugged!$"
-Text_1855A6:: @ 81855A6
+Route12_Text_LucaPostBattle:: @ 81855A6
.string "Water conducts electricity, so you\n"
.string "should zap sea POKéMON.$"
-Text_1855E1:: @ 81855E1
+Route12_Text_HankIntro:: @ 81855E1
.string "The FISHING FOOL versus POKéMON\n"
.string "KID!$"
-Text_185606:: @ 8185606
+Route12_Text_HankDefeat:: @ 8185606
.string "Touch too much!$"
-Text_185616:: @ 8185616
+Route12_Text_HankPostBattle:: @ 8185616
.string "I guess you get to be good at\n"
.string "what you like.\p"
.string "Well, you beat me at POKéMON,\n"
.string "but you can't top me at fishing.$"
-Text_185682:: @ 8185682
+Route12_Text_ElliotIntro:: @ 8185682
.string "I love fishing, don't get me wrong.\p"
.string "But it'd be best if I also had more\n"
.string "work.$"
-Text_1856D0:: @ 81856D0
+Route12_Text_ElliotDefeat:: @ 81856D0
.string "It's not easy…$"
-Text_1856DF:: @ 81856DF
+Route12_Text_ElliotPostBattle:: @ 81856DF
.string "It's all right.\n"
.string "Losing doesn't bug me anymore.$"
-Text_18570E:: @ 818570E
+Route12_Text_AndrewIntro:: @ 818570E
.string "What's catching?\p"
.string "You never know what you could\n"
.string "catch!$"
-Text_185744:: @ 8185744
+Route12_Text_AndrewDefeat:: @ 8185744
.string "Lost it!$"
-Text_18574D:: @ 818574D
+Route12_Text_AndrewPostBattle:: @ 818574D
.string "What, MAGIKARP?\p"
.string "I catch them all the time, sure.\n"
.string "But, boy are they wimpy.$"
@@ -109,3 +109,36 @@ Route12_Text_RouteSign:: @ 8185797
Route12_Text_SportfishingArea:: @ 81857B3
.string "SPORTFISHING AREA$"
+Route12_Text_JesIntro:: @ 81857C5
+ .string "JES: If I win, I'm going to\n"
+ .string "propose to GIA.$"
+
+Route12_Text_JesDefeat:: @ 81857F1
+ .string "JES: Oh, please, why couldn't you\n"
+ .string "let us win?$"
+
+Route12_Text_JesPostBattle:: @ 818581F
+ .string "JES: Oh, GIA, forgive me,\n"
+ .string "my love!$"
+
+Route12_Text_JesNotEnoughMons:: @ 8185842
+ .string "JES: GIA and I, we'll be\n"
+ .string "together forever.\p"
+ .string "We won't battle unless you have\n"
+ .string "two POKéMON of your own.$"
+
+Route12_Text_GiaIntro:: @ 81858A6
+ .string "GIA: Hey, JES…\p"
+ .string "If we win, I'll marry you!$"
+
+Route12_Text_GiaDefeat:: @ 81858D0
+ .string "GIA: Oh, but why?$"
+
+Route12_Text_GiaPostBattle:: @ 81858E2
+ .string "GIA: JES, you silly!\n"
+ .string "You ruined this!$"
+
+Route12_Text_GiaNotEnoughMons:: @ 8185908
+ .string "GIA: I can't bear to battle\n"
+ .string "without my JES!\p"
+ .string "Don't you have one more POKéMON?$"
diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json
index fabd77a97..9000a0de5 100644
--- a/data/maps/Route12_FishingHouse/map.json
+++ b/data/maps/Route12_FishingHouse/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_FishingHouse_EventScript_16FF0C",
+ "script": "Route12_FishingHouse_EventScript_FishingGuruBrother",
"flag": "0"
}
],
@@ -57,7 +57,7 @@
"x": 9,
"y": 1,
"elevation": 0,
- "script": "Route12_FishingHouse_EventScript_170067"
+ "script": "Route12_FishingHouse_EventScript_MagikarpRecordSign"
}
]
}
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index e1cd920d7..4b8386a86 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -1,110 +1,110 @@
Route12_FishingHouse_MapScripts:: @ 816FF0B
.byte 0
-Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
+Route12_FishingHouse_EventScript_FishingGuruBrother:: @ 816FF0C
lock
faceplayer
- goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F
- msgbox gUnknown_819EFE0, MSGBOX_YESNO
+ goto_if_set FLAG_GOT_SUPER_ROD, Route12_FishingHouse_EventScript_CheckMagikarpRecord
+ msgbox Route12_FishingHouse_Text_DoYouLikeToFish, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq EventScript_16FF34
- msgbox gUnknown_819F1FA
+ goto_if_eq Route12_FishingHouse_EventScript_GiveSuperRod
+ msgbox Route12_FishingHouse_Text_OhThatsDisappointing
release
end
-EventScript_16FF34:: @ 816FF34
+Route12_FishingHouse_EventScript_GiveSuperRod:: @ 816FF34
checkitemspace ITEM_SUPER_ROD, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_16FF75
+ goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod
additem ITEM_SUPER_ROD
- msgbox gUnknown_819F05B
- msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD
+ msgbox Route12_FishingHouse_Text_TakeThisAndFish
+ msgreceiveditem Route12_FishingHouse_Text_ReceivedSuperRod, ITEM_SUPER_ROD
setflag FLAG_GOT_SUPER_ROD
- msgbox gUnknown_819F0EB
+ msgbox Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe
release
end
-EventScript_16FF75:: @ 816FF75
- msgbox gUnknown_819F494
+Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75
+ msgbox Route12_FishingHouse_Text_NoRoomForGift
release
end
-EventScript_16FF7F:: @ 816FF7F
+Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
- compare VAR_RESULT, 0
- goto_if_eq EventScript_16FFF5
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty
special GetMagikarpSizeRecordInfo
- msgbox gUnknown_819F2DB
+ msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
- compare VAR_RESULT, 6
- goto_if_ge EventScript_16FFFF
+ compare VAR_RESULT, PARTY_SIZE
+ goto_if_ge Route12_FishingHouse_EventScript_CancelShowMon
special CompareMagikarpSize
compare VAR_RESULT, 1
- goto_if_eq EventScript_170001
+ goto_if_eq Route12_FishingHouse_EventScript_NotMagikarp
compare VAR_RESULT, 2
- goto_if_eq EventScript_17000B
+ goto_if_eq Route12_FishingHouse_EventScript_NotRecordMagikarp
compare VAR_RESULT, 3
- goto_if_eq EventScript_170031
+ goto_if_eq Route12_FishingHouse_EventScript_NewRecordMagikarp
compare VAR_RESULT, 4
- goto_if_eq EventScript_17001E
+ goto_if_eq Route12_FishingHouse_EventScript_TieRecordMagikarp
release
end
-EventScript_16FFF5:: @ 816FFF5
- msgbox gUnknown_819F217
+Route12_FishingHouse_EventScript_NoMagikarpInParty:: @ 816FFF5
+ msgbox Route12_FishingHouse_Text_TryFishingBringMeMagikarp
release
end
-EventScript_16FFFF:: @ 816FFFF
+Route12_FishingHouse_EventScript_CancelShowMon:: @ 816FFFF
release
end
-EventScript_170001:: @ 8170001
- msgbox gUnknown_819F468
+Route12_FishingHouse_EventScript_NotMagikarp:: @ 8170001
+ msgbox Route12_FishingHouse_Text_DoesntLookLikeMagikarp
release
end
-EventScript_17000B:: @ 817000B
- goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031
- msgbox gUnknown_819F40A
+Route12_FishingHouse_EventScript_NotRecordMagikarp:: @ 817000B
+ goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp
+ msgbox Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp
release
end
-EventScript_17001E:: @ 817001E
- goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031
- msgbox gUnknown_819F3CB
+Route12_FishingHouse_EventScript_TieRecordMagikarp:: @ 817001E
+ goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp
+ msgbox Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast
release
end
-EventScript_170031:: @ 8170031
+Route12_FishingHouse_EventScript_NewRecordMagikarp:: @ 8170031
setflag FLAG_GOT_RECORD_SETTING_MAGIKARP
- msgbox gUnknown_819F31B
+ msgbox Route12_FishingHouse_Text_WhoaXInchesTakeThis
giveitem ITEM_NET_BALL
- compare VAR_RESULT, 0
- goto_if_eq EventScript_17005D
- msgbox gUnknown_819F395
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route12_FishingHouse_EventScript_NoRoomForNetBall
+ msgbox Route12_FishingHouse_Text_LookForwardToGreaterRecords
release
end
-EventScript_17005D:: @ 817005D
- msgbox gUnknown_819F494
+Route12_FishingHouse_EventScript_NoRoomForNetBall:: @ 817005D
+ msgbox Route12_FishingHouse_Text_NoRoomForGift
release
end
-Route12_FishingHouse_EventScript_170067:: @ 8170067
+Route12_FishingHouse_EventScript_MagikarpRecordSign:: @ 8170067
lockall
- goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B
- msgbox gUnknown_819F50C
+ goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet
+ msgbox Route12_FishingHouse_Text_BlankChartOfSomeSort
releaseall
end
-EventScript_17007B:: @ 817007B
+Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet:: @ 817007B
special GetMagikarpSizeRecordInfo
- msgbox gUnknown_819F4CF
+ msgbox Route12_FishingHouse_Text_MostGiganticMagikarpXInches
releaseall
end
diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc
index 4f1f3f1fd..efe9b62a6 100644
--- a/data/maps/Route12_FishingHouse/text.inc
+++ b/data/maps/Route12_FishingHouse/text.inc
@@ -1,20 +1,20 @@
-gUnknown_819EFE0:: @ 819EFE0
+Route12_FishingHouse_Text_DoYouLikeToFish:: @ 819EFE0
.string "I'm the FISHING GURU's younger\n"
.string "brother.\p"
.string "I simply looove fishing!\n"
.string "I can't bear to go without.\p"
.string "Tell me, do you like to fish?$"
-gUnknown_819F05B:: @ 819F05B
+Route12_FishingHouse_Text_TakeThisAndFish:: @ 819F05B
.string "Grand! I like your style.\n"
.string "I think we can be friends.\p"
.string "Take this and fish, young friend!$"
-gUnknown_819F0B2:: @ 819F0B2
+Route12_FishingHouse_Text_ReceivedSuperRod:: @ 819F0B2
.string "{PLAYER} received a SUPER ROD from\n"
.string "the FISHING GURU's brother.$"
-gUnknown_819F0EB:: @ 819F0EB
+Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: @ 819F0EB
.string "Fishing is a way of life!\n"
.string "It is like the finest poetry.\p"
.string "From the seas to rivers, go out\n"
@@ -25,11 +25,11 @@ gUnknown_819F0EB:: @ 819F0EB
.string "As much as I love to fish, I also\n"
.string "love seeing gigantic MAGIKARP.$"
-gUnknown_819F1FA:: @ 819F1FA
+Route12_FishingHouse_Text_OhThatsDisappointing:: @ 819F1FA
.string "Oh…\n"
.string "That's so disappointing…$"
-gUnknown_819F217:: @ 819F217
+Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: @ 819F217
.string "Hello there, {PLAYER}!\n"
.string "Have you been fishing?\p"
.string "Try fishing with the SUPER ROD in\n"
@@ -39,12 +39,12 @@ gUnknown_819F217:: @ 819F217
.string "Oh, and don't forget to bring me\n"
.string "gigantic MAGIKARP.$"
-gUnknown_819F2DB:: @ 819F2DB
+Route12_FishingHouse_Text_OhMagikarpAllowMeToSee:: @ 819F2DB
.string "Oh? {PLAYER}?\n"
.string "Why, if it isn't a MAGIKARP!\p"
.string "Allow me to see it, quick!$"
-gUnknown_819F31B:: @ 819F31B
+Route12_FishingHouse_Text_WhoaXInchesTakeThis:: @ 819F31B
.string "… … …Whoa!\n"
.string "{STR_VAR_2} inches!\p"
.string "You have a rare appreciation for\n"
@@ -52,37 +52,37 @@ gUnknown_819F31B:: @ 819F31B
.string "You must take this.\n"
.string "I insist!$"
-gUnknown_819F395:: @ 819F395
+Route12_FishingHouse_Text_LookForwardToGreaterRecords:: @ 819F395
.string "I'll look forward to seeing greater\n"
.string "records from you!$"
-gUnknown_819F3CB:: @ 819F3CB
+Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast:: @ 819F3CB
.string "Huh?\n"
.string "{STR_VAR_2} inches?\p"
.string "This is the same size as the one\n"
.string "I saw before.$"
-gUnknown_819F40A:: @ 819F40A
+Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp:: @ 819F40A
.string "Hmm…\n"
.string "This one is {STR_VAR_2} inches long.\p"
.string "It doesn't measure up to the\n"
.string "{STR_VAR_3}-inch one you brought before.$"
-gUnknown_819F468:: @ 819F468
+Route12_FishingHouse_Text_DoesntLookLikeMagikarp:: @ 819F468
.string "Uh… That doesn't look much like\n"
.string "a MAGIKARP.$"
-gUnknown_819F494:: @ 819F494
+Route12_FishingHouse_Text_NoRoomForGift:: @ 819F494
.string "Oh, no!\p"
.string "I had a gift for you, but you have\n"
.string "no room for it.$"
-gUnknown_819F4CF:: @ 819F4CF
+Route12_FishingHouse_Text_MostGiganticMagikarpXInches:: @ 819F4CF
.string "The most gigantic MAGIKARP\n"
.string "I have ever witnessed…\p"
.string "{STR_VAR_3} inches!$"
-gUnknown_819F50C:: @ 819F50C
+Route12_FishingHouse_Text_BlankChartOfSomeSort:: @ 819F50C
.string "It's a blank chart of some sort.\p"
.string "It has spaces for writing in\n"
.string "records of some kind.$"
diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json
index d06875648..834559791 100644
--- a/data/maps/Route12_NorthEntrance_1F/map.json
+++ b/data/maps/Route12_NorthEntrance_1F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_NorthEntrance_1F_EventScript_16FE6E",
+ "script": "Route12_NorthEntrance_1F_EventScript_Guard",
"flag": "0"
}
],
diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc
index 990d5f793..a2aa84b00 100644
--- a/data/maps/Route12_NorthEntrance_1F/scripts.inc
+++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc
@@ -1,6 +1,6 @@
Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D
.byte 0
-Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E
- msgbox gUnknown_819EDA7, MSGBOX_NPC
+Route12_NorthEntrance_1F_EventScript_Guard:: @ 816FE6E
+ msgbox Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs, MSGBOX_NPC
end
diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc
index 32f34428f..34dc041f8 100644
--- a/data/maps/Route12_NorthEntrance_1F/text.inc
+++ b/data/maps/Route12_NorthEntrance_1F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819EDA7:: @ 819EDA7
+Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs:: @ 819EDA7
.string "There's a lookout spot upstairs.\n"
.string "The view is magnificent.$"
diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json
index f2cf37890..042658121 100644
--- a/data/maps/Route12_NorthEntrance_2F/map.json
+++ b/data/maps/Route12_NorthEntrance_2F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route12_NorthEntrance_2F_EventScript_16FE8A",
+ "script": "Route12_NorthEntrance_2F_EventScript_Lass",
"flag": "0"
}
],
@@ -43,14 +43,14 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "Route12_NorthEntrance_2F_EventScript_16FE78"
+ "script": "Route12_NorthEntrance_2F_EventScript_LeftBinoculars"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 1,
"elevation": 0,
- "script": "Route12_NorthEntrance_2F_EventScript_16FE81"
+ "script": "Route12_NorthEntrance_2F_EventScript_RightBinoculars"
}
]
}
diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc
index b9fee6dda..a85398238 100644
--- a/data/maps/Route12_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc
@@ -1,46 +1,46 @@
Route12_NorthEntrance_2F_MapScripts:: @ 816FE77
.byte 0
-Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78
- msgbox gUnknown_819EF5D, MSGBOX_SIGN
+Route12_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 816FE78
+ msgbox Route12_NorthEntrance_2F_Text_TheresManFishing, MSGBOX_SIGN
end
-Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81
- msgbox gUnknown_819EFA0, MSGBOX_SIGN
+Route12_NorthEntrance_2F_EventScript_RightBinoculars:: @ 816FE81
+ msgbox Route12_NorthEntrance_2F_Text_ItsPokemonTower, MSGBOX_SIGN
end
-Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A
+Route12_NorthEntrance_2F_EventScript_Lass:: @ 816FE8A
lock
faceplayer
- goto_if_set FLAG_GOT_TM27, EventScript_16FF01
+ goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq EventScript_16FEE5
+ call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale
compare VAR_RESULT, FEMALE
- call_if_eq EventScript_16FEEE
+ call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale
checkitemspace ITEM_TM27, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_16FEF7
- giveitem_msg gUnknown_819EE9F, ITEM_TM27
- msgbox gUnknown_819EEC6
+ goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27
+ giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27
+ msgbox Route12_NorthEntrance_2F_Text_ExplainTM27
setflag FLAG_GOT_TM27
release
end
-EventScript_16FEE5:: @ 816FEE5
- msgbox gUnknown_819EDE1
+Route12_NorthEntrance_2F_EventScript_TakeTMMale:: @ 816FEE5
+ msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale
return
-EventScript_16FEEE:: @ 816FEEE
- msgbox gUnknown_819EE40
+Route12_NorthEntrance_2F_EventScript_TakeTMFemale:: @ 816FEEE
+ msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale
return
-EventScript_16FEF7:: @ 816FEF7
- msgbox gUnknown_819EF3F
+Route12_NorthEntrance_2F_EventScript_NoRoomForTM27:: @ 816FEF7
+ msgbox Route12_NorthEntrance_2F_Text_DontHaveRoomForThis
release
end
-EventScript_16FF01:: @ 816FF01
- msgbox gUnknown_819EEC6
+Route12_NorthEntrance_2F_EventScript_ExplainTM27:: @ 816FF01
+ msgbox Route12_NorthEntrance_2F_Text_ExplainTM27
release
end
diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc
index df2ac596b..6e525d6e4 100644
--- a/data/maps/Route12_NorthEntrance_2F/text.inc
+++ b/data/maps/Route12_NorthEntrance_2F/text.inc
@@ -1,34 +1,35 @@
-gUnknown_819EDE1:: @ 819EDE1
+@ Male and female text identical, differ (presumably) in JP
+Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale:: @ 819EDE1
.string "My POKéMON's ashes are stored in\n"
.string "POKéMON TOWER.\p"
.string "You can have this TM.\n"
.string "I don't need it anymore…$"
-gUnknown_819EE40:: @ 819EE40
+Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale:: @ 819EE40
.string "My POKéMON's ashes are stored in\n"
.string "POKéMON TOWER.\p"
.string "You can have this TM.\n"
.string "I don't need it anymore…$"
-gUnknown_819EE9F:: @ 819EE9F
+Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl:: @ 819EE9F
.string "{PLAYER} received TM27\n"
.string "from the little girl.$"
-gUnknown_819EEC6:: @ 819EEC6
+Route12_NorthEntrance_2F_Text_ExplainTM27:: @ 819EEC6
.string "TM27 is a move called RETURN…\p"
.string "If you treat your POKéMON good,\n"
.string "it will return your love by working\l"
.string "its hardest in battle.$"
-gUnknown_819EF3F:: @ 819EF3F
+Route12_NorthEntrance_2F_Text_DontHaveRoomForThis:: @ 819EF3F
.string "You don't have room for this.$"
-gUnknown_819EF5D:: @ 819EF5D
+Route12_NorthEntrance_2F_Text_TheresManFishing:: @ 819EF5D
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "There's a man fishing!$"
-gUnknown_819EFA0:: @ 819EFA0
+Route12_NorthEntrance_2F_Text_ItsPokemonTower:: @ 819EFA0
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "It's POKéMON TOWER!$"
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 2e9f47d52..b7b92937f 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route13_EventScript_1AA803",
+ "script": "Route13_EventScript_Alma",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route13_EventScript_1AA749",
+ "script": "Route13_EventScript_Sebastian",
"flag": "0"
},
{
@@ -60,7 +60,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route13_EventScript_1AA841",
+ "script": "Route13_EventScript_Susie",
"flag": "0"
},
{
@@ -73,7 +73,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route13_EventScript_1AA70B",
+ "script": "Route13_EventScript_Sheila",
"flag": "0"
},
{
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route13_EventScript_1AA6CD",
+ "script": "Route13_EventScript_Lola",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route13_EventScript_1AA87F",
+ "script": "Route13_EventScript_Valerie",
"flag": "0"
},
{
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route13_EventScript_1AA8BD",
+ "script": "Route13_EventScript_Gwen",
"flag": "0"
},
{
@@ -125,7 +125,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route13_EventScript_1AA7C5",
+ "script": "Route13_EventScript_Robert",
"flag": "0"
},
{
@@ -138,7 +138,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route13_EventScript_1AA787",
+ "script": "Route13_EventScript_Perry",
"flag": "0"
},
{
@@ -151,7 +151,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route13_EventScript_1AA68F",
+ "script": "Route13_EventScript_Jared",
"flag": "0"
},
{
@@ -176,21 +176,21 @@
"x": 41,
"y": 12,
"elevation": 0,
- "script": "Route13_EventScript_1680C8"
+ "script": "Route13_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 37,
"y": 6,
"elevation": 0,
- "script": "Route13_EventScript_1680BF"
+ "script": "Route13_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 14,
"elevation": 0,
- "script": "Route13_EventScript_1680B6"
+ "script": "Route13_EventScript_TrainerTips1"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc
index 6524d5dd6..9cedaa23f 100644
--- a/data/maps/Route13/scripts.inc
+++ b/data/maps/Route13/scripts.inc
@@ -1,14 +1,14 @@
Route13_MapScripts:: @ 81680B5
.byte 0
-Route13_EventScript_1680B6:: @ 81680B6
- msgbox gUnknown_8185DB7, MSGBOX_SIGN
+Route13_EventScript_TrainerTips1:: @ 81680B6
+ msgbox Route13_Text_LookToLeftOfThatPost, MSGBOX_SIGN
end
-Route13_EventScript_1680BF:: @ 81680BF
- msgbox gUnknown_8185DEF, MSGBOX_SIGN
+Route13_EventScript_TrainerTips2:: @ 81680BF
+ msgbox Route13_Text_SelectToSwitchItems, MSGBOX_SIGN
end
-Route13_EventScript_1680C8:: @ 81680C8
- msgbox gUnknown_8185E2C, MSGBOX_SIGN
+Route13_EventScript_RouteSign:: @ 81680C8
+ msgbox Route13_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc
index 1b570d424..edf58209c 100644
--- a/data/maps/Route13/text.inc
+++ b/data/maps/Route13/text.inc
@@ -1,162 +1,128 @@
-Text_1857C5:: @ 81857C5
- .string "JES: If I win, I'm going to\n"
- .string "propose to GIA.$"
-
-Text_1857F1:: @ 81857F1
- .string "JES: Oh, please, why couldn't you\n"
- .string "let us win?$"
-
-Text_18581F:: @ 818581F
- .string "JES: Oh, GIA, forgive me,\n"
- .string "my love!$"
-
-Text_185842:: @ 8185842
- .string "JES: GIA and I, we'll be\n"
- .string "together forever.\p"
- .string "We won't battle unless you have\n"
- .string "two POKéMON of your own.$"
-
-Text_1858A6:: @ 81858A6
- .string "GIA: Hey, JES…\p"
- .string "If we win, I'll marry you!$"
-
-Text_1858D0:: @ 81858D0
- .string "GIA: Oh, but why?$"
-
-Text_1858E2:: @ 81858E2
- .string "GIA: JES, you silly!\n"
- .string "You ruined this!$"
-
-Text_185908:: @ 8185908
- .string "GIA: I can't bear to battle\n"
- .string "without my JES!\p"
- .string "Don't you have one more POKéMON?$"
-
-Text_185955:: @ 8185955
+Route13_Text_SebastianIntro:: @ 8185955
.string "My bird POKéMON want to battle\n"
.string "with you!$"
-Text_18597E:: @ 818597E
+Route13_Text_SebastianDefeat:: @ 818597E
.string "My PIDGEY and PIDGEOTTO combo\n"
.string "lost?$"
-Text_1859A2:: @ 81859A2
+Route13_Text_SebastianPostBattle:: @ 81859A2
.string "My POKéMON look happy even though\n"
.string "they lost.$"
-Text_1859CF:: @ 81859CF
+Route13_Text_SusieIntro:: @ 81859CF
.string "I'm told I'm good for a kid.$"
-Text_1859EC:: @ 81859EC
+Route13_Text_SusieDefeat:: @ 81859EC
.string "Ohh!\n"
.string "I lost!$"
-Text_1859F9:: @ 81859F9
+Route13_Text_SusiePostBattle:: @ 81859F9
.string "I want to become a good TRAINER.\n"
.string "I'll train hard, just watch.$"
-Text_185A37:: @ 8185A37
+Route13_Text_ValerieIntro:: @ 8185A37
.string "Wow!\n"
.string "Your BADGES are too cool!$"
-Text_185A56:: @ 8185A56
+Route13_Text_ValerieDefeat:: @ 8185A56
.string "Not enough!$"
-Text_185A62:: @ 8185A62
+Route13_Text_ValeriePostBattle:: @ 8185A62
.string "You got those BADGES from GYM\n"
.string "LEADERS. I know!$"
-Text_185A91:: @ 8185A91
+Route13_Text_GwenIntro:: @ 8185A91
.string "My cute POKéMON wish to make your\n"
.string "acquaintance.$"
-Text_185AC1:: @ 8185AC1
+Route13_Text_GwenDefeat:: @ 8185AC1
.string "Good going!\n"
.string "You totally won!$"
-Text_185ADE:: @ 8185ADE
+Route13_Text_GwenPostBattle:: @ 8185ADE
.string "You have to make POKéMON battle\n"
.string "to toughen them up.$"
-Text_185B12:: @ 8185B12
+Route13_Text_AlmaIntro:: @ 8185B12
.string "I found CARBOS in a cave once\n"
.string "while I was spelunking.$"
-Text_185B48:: @ 8185B48
+Route13_Text_AlmaDefeat:: @ 8185B48
.string "Oh, too bad!\n"
.string "I just messed up!$"
-Text_185B67:: @ 8185B67
+Route13_Text_AlmaPostBattle:: @ 8185B67
.string "CARBOS boosted the SPEED of my\n"
.string "POKéMON.$"
-Text_185B8F:: @ 8185B8F
+Route13_Text_PerryIntro:: @ 8185B8F
.string "I'm not going to lose.\n"
.string "Not when the wind's blowing my way!$"
-Text_185BCA:: @ 8185BCA
+Route13_Text_PerryDefeat:: @ 8185BCA
.string "The wind turned!$"
-Text_185BDB:: @ 8185BDB
+Route13_Text_PerryPostBattle:: @ 8185BDB
.string "I'm beat.\n"
.string "I guess I'll FLY home.$"
-Text_185BFC:: @ 8185BFC
+Route13_Text_LolaIntro:: @ 8185BFC
.string "Sure, I'll play with you, sweetie.$"
-Text_185C1F:: @ 8185C1F
+Route13_Text_LolaDefeat:: @ 8185C1F
.string "Oh!\n"
.string "You little beast!$"
-Text_185C35:: @ 8185C35
+Route13_Text_LolaPostBattle:: @ 8185C35
.string "I wonder which is stronger, male or\n"
.string "female POKéMON?$"
-Text_185C69:: @ 8185C69
+Route13_Text_SheilaIntro:: @ 8185C69
.string "Do you want to battle some\n"
.string "POKéMON with me?$"
-Text_185C95:: @ 8185C95
+Route13_Text_SheilaDefeat:: @ 8185C95
.string "It's over already?$"
-Text_185CA8:: @ 8185CA8
+Route13_Text_SheilaPostBattle:: @ 8185CA8
.string "I don't know anything about\n"
.string "POKéMON actually.\p"
.string "The ones I use… I picked them\n"
.string "for their looks!$"
-Text_185D05:: @ 8185D05
+Route13_Text_JaredIntro:: @ 8185D05
.string "What're you lookin' at?$"
-Text_185D1D:: @ 8185D1D
+Route13_Text_JaredDefeat:: @ 8185D1D
.string "Dang!\n"
.string "Stripped gears!$"
-Text_185D33:: @ 8185D33
+Route13_Text_JaredPostBattle:: @ 8185D33
.string "Get lost!$"
-Text_185D3D:: @ 8185D3D
+Route13_Text_RobertIntro:: @ 8185D3D
.string "I always go with bird POKéMON.\n"
.string "I've dedicated myself to them.$"
-Text_185D7B:: @ 8185D7B
+Route13_Text_RobertDefeat:: @ 8185D7B
.string "Out of power!$"
-Text_185D89:: @ 8185D89
+Route13_Text_RobertPostBattle:: @ 8185D89
.string "I wish I could fly like PIDGEY and\n"
.string "PIDGEOTTO…$"
-gUnknown_8185DB7:: @ 8185DB7
+Route13_Text_LookToLeftOfThatPost:: @ 8185DB7
.string "TRAINER TIPS\p"
.string "Look, look!\n"
.string "Look to the left of that post!$"
-gUnknown_8185DEF:: @ 8185DEF
+Route13_Text_SelectToSwitchItems:: @ 8185DEF
.string "TRAINER TIPS\p"
.string "Use SELECT to switch items in the\n"
.string "ITEMS window.$"
-gUnknown_8185E2C:: @ 8185E2C
+Route13_Text_RouteSign:: @ 8185E2C
.string "ROUTE 13\n"
.string "North to SILENCE BRIDGE$"
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
index cf88cbf8a..dd49ec12e 100644
--- a/data/maps/Route14/map.json
+++ b/data/maps/Route14/map.json
@@ -34,7 +34,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route14_EventScript_1AA9B5",
+ "script": "Route14_EventScript_Gerald",
"flag": "0"
},
{
@@ -47,7 +47,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AA9F3",
+ "script": "Route14_EventScript_Donald",
"flag": "0"
},
{
@@ -60,7 +60,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route14_EventScript_1AAAEB",
+ "script": "Route14_EventScript_Beck",
"flag": "0"
},
{
@@ -73,7 +73,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route14_EventScript_1AAB29",
+ "script": "Route14_EventScript_Marlon",
"flag": "0"
},
{
@@ -86,7 +86,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route14_EventScript_1AA977",
+ "script": "Route14_EventScript_Isaac",
"flag": "0"
},
{
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route14_EventScript_1AA8FB",
+ "script": "Route14_EventScript_Malik",
"flag": "0"
},
{
@@ -112,7 +112,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AAAAD",
+ "script": "Route14_EventScript_Mitch",
"flag": "0"
},
{
@@ -125,7 +125,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AAA6F",
+ "script": "Route14_EventScript_Carter",
"flag": "0"
},
{
@@ -138,7 +138,7 @@
"movement_range_y": 6,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AA939",
+ "script": "Route14_EventScript_Lukas",
"flag": "0"
},
{
@@ -151,7 +151,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AAA31",
+ "script": "Route14_EventScript_Benny",
"flag": "0"
},
{
@@ -203,7 +203,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AABAD",
+ "script": "Route14_EventScript_Jan",
"flag": "0"
},
{
@@ -216,7 +216,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route14_EventScript_1AAB67",
+ "script": "Route14_EventScript_Kiri",
"flag": "0"
}
],
@@ -228,7 +228,7 @@
"x": 17,
"y": 12,
"elevation": 0,
- "script": "Route14_EventScript_1680D2"
+ "script": "Route14_EventScript_RouteSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc
index 551940250..46e3774ee 100644
--- a/data/maps/Route14/scripts.inc
+++ b/data/maps/Route14/scripts.inc
@@ -1,6 +1,6 @@
Route14_MapScripts:: @ 81680D1
.byte 0
-Route14_EventScript_1680D2:: @ 81680D2
- msgbox gUnknown_8186399, MSGBOX_SIGN
+Route14_EventScript_RouteSign:: @ 81680D2
+ msgbox Route14_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc
index 37008ab3b..320c250ee 100644
--- a/data/maps/Route14/text.inc
+++ b/data/maps/Route14/text.inc
@@ -1,126 +1,156 @@
-Text_185E4D:: @ 8185E4D
+Route14_Text_CarterIntro:: @ 8185E4D
.string "You need to use TMs to teach good\n"
.string "moves to POKéMON.$"
-Text_185E81:: @ 8185E81
+Route14_Text_CarterDefeat:: @ 8185E81
.string "Not good enough quite yet.$"
-Text_185E9C:: @ 8185E9C
+Route14_Text_CarterPostBattle:: @ 8185E9C
.string "You have some HMs, right? POKéMON\n"
.string "can't forget those moves easily.$"
-Text_185EDF:: @ 8185EDF
+Route14_Text_MitchIntro:: @ 8185EDF
.string "My bird POKéMON should be ready\n"
.string "for battle.$"
-Text_185F0B:: @ 8185F0B
+Route14_Text_MitchDefeat:: @ 8185F0B
.string "Not ready yet!$"
-Text_185F1A:: @ 8185F1A
+Route14_Text_MitchPostBattle:: @ 8185F1A
.string "My bird POKéMON need to learn\n"
.string "better moves.$"
-Text_185F46:: @ 8185F46
+Route14_Text_BeckIntro:: @ 8185F46
.string "They have TMs on sale at the\n"
.string "CELADON DEPT. STORE.\p"
.string "TMs aren't really rare, but not\n"
.string "many people have HMs.$"
-Text_185FAE:: @ 8185FAE
+Route14_Text_BeckDefeat:: @ 8185FAE
.string "Aww, bummer!$"
-Text_185FBB:: @ 8185FBB
+Route14_Text_BeckPostBattle:: @ 8185FBB
.string "Try teaching POKéMON a move that's\n"
.string "the same type as it.\p"
.string "That apparently boosts the power\n"
.string "of the move.$"
-Text_186021:: @ 8186021
+Route14_Text_MarlonIntro:: @ 8186021
.string "Have you taught your bird POKéMON\n"
.string "how to FLY?\p"
.string "You'll be able to soar with it into\n"
.string "the sky!$"
-Text_18607C:: @ 818607C
+Route14_Text_MarlonDefeat:: @ 818607C
.string "Shot down in flames!$"
-Text_186091:: @ 8186091
+Route14_Text_MarlonPostBattle:: @ 8186091
.string "Bird POKéMON are my one true love.\n"
.string "I don't want to raise anything else.$"
-Text_1860D9:: @ 81860D9
+Route14_Text_DonaldIntro:: @ 81860D9
.string "Have you heard the legend of the\n"
.string "winged mirages?$"
-Text_18610A:: @ 818610A
+Route14_Text_DonaldDefeat:: @ 818610A
.string "Why?\n"
.string "Why'd I lose?$"
-Text_18611D:: @ 818611D
+Route14_Text_DonaldPostBattle:: @ 818611D
.string "Well, the winged mirages are the\n"
.string "legendary bird POKéMON.\p"
.string "There are three of them: ARTICUNO,\n"
.string "ZAPDOS, and MOLTRES.$"
-Text_18618E:: @ 818618E
+Route14_Text_BennyIntro:: @ 818618E
.string "I'm not into it, but okay.\n"
.string "Let's go!$"
-Text_1861B3:: @ 81861B3
+Route14_Text_BennyDefeat:: @ 81861B3
.string "I knew it!$"
-Text_1861BE:: @ 81861BE
+Route14_Text_BennyPostBattle:: @ 81861BE
.string "Winning, losing… It's insignificant\n"
.string "under this huge sky.$"
-Text_1861F7:: @ 81861F7
+Route14_Text_LukasIntro:: @ 81861F7
.string "C'mon, c'mon.\n"
.string "Let's go, let's go, let's go!$"
-Text_186223:: @ 8186223
+Route14_Text_LukasDefeat:: @ 8186223
.string "Arrg!\n"
.string "Lost! Get lost!$"
-Text_186239:: @ 8186239
+Route14_Text_LukasPostBattle:: @ 8186239
.string "What, what, what?\n"
.string "What do you want still?$"
-Text_186263:: @ 8186263
+Route14_Text_IsaacIntro:: @ 8186263
.string "I need to burn some time.\n"
.string "Shut up and battle.$"
-Text_186291:: @ 8186291
+Route14_Text_IsaacDefeat:: @ 8186291
.string "What?\n"
.string "You!?$"
-Text_18629D:: @ 818629D
+Route14_Text_IsaacPostBattle:: @ 818629D
.string "Raising POKéMON is a drag, man.$"
-Text_1862BD:: @ 81862BD
+Route14_Text_GeraldIntro:: @ 81862BD
.string "We ride out here because of the\n"
.string "wide-open spaces.$"
-Text_1862EF:: @ 81862EF
+Route14_Text_GeraldDefeat:: @ 81862EF
.string "Wipeout!$"
-Text_1862F8:: @ 81862F8
+Route14_Text_GeraldPostBattle:: @ 81862F8
.string "It's cool you made your POKéMON so\n"
.string "strong.\p"
.string "Might is right!\n"
.string "And you know it!$"
-Text_186344:: @ 8186344
+Route14_Text_MalikIntro:: @ 8186344
.string "POKéMON battle?\n"
.string "Cool! Rumble!$"
-Text_186362:: @ 8186362
+Route14_Text_MalikDefeat:: @ 8186362
.string "Blown away!$"
-Text_18636E:: @ 818636E
+Route14_Text_MalikPostBattle:: @ 818636E
.string "You know who'd win, you and me\n"
.string "one-on-one!$"
-gUnknown_8186399:: @ 8186399
+Route14_Text_RouteSign:: @ 8186399
.string "ROUTE 14\n"
.string "West to FUCHSIA CITY$"
+Route14_Text_KiriIntro:: @ 81863B7
+ .string "KIRI: JAN, let's try really,\n"
+ .string "really hard together.$"
+
+Route14_Text_KiriDefeat:: @ 81863EA
+ .string "KIRI: Whimper…\n"
+ .string "We lost, didn't we?$"
+
+Route14_Text_KiriPostBattle:: @ 818640D
+ .string "KIRI: Did we lose because of me?$"
+
+Route14_Text_KiriNotEnoughMons:: @ 818642E
+ .string "KIRI: We can battle if you have\n"
+ .string "two POKéMON.$"
+
+Route14_Text_JanIntro:: @ 818645B
+ .string "JAN: KIRI, here we go!\n"
+ .string "We have to try hard!$"
+
+Route14_Text_JanDefeat:: @ 8186487
+ .string "JAN: Eeeeh!\n"
+ .string "No fair!$"
+
+Route14_Text_JanPostBattle:: @ 818649C
+ .string "JAN: KIRI, don't cry!\n"
+ .string "We'll just try harder next time.$"
+
+Route14_Text_JanNotEnoughMons:: @ 81864D3
+ .string "JAN: You want to battle?\n"
+ .string "You don't have enough POKéMON.$"
diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc
index 34e3a0c60..33c60e7dc 100644
--- a/data/maps/Route15/text.inc
+++ b/data/maps/Route15/text.inc
@@ -1,34 +1,3 @@
-Text_1863B7:: @ 81863B7
- .string "KIRI: JAN, let's try really,\n"
- .string "really hard together.$"
-
-Text_1863EA:: @ 81863EA
- .string "KIRI: Whimper…\n"
- .string "We lost, didn't we?$"
-
-Text_18640D:: @ 818640D
- .string "KIRI: Did we lose because of me?$"
-
-Text_18642E:: @ 818642E
- .string "KIRI: We can battle if you have\n"
- .string "two POKéMON.$"
-
-Text_18645B:: @ 818645B
- .string "JAN: KIRI, here we go!\n"
- .string "We have to try hard!$"
-
-Text_186487:: @ 8186487
- .string "JAN: Eeeeh!\n"
- .string "No fair!$"
-
-Text_18649C:: @ 818649C
- .string "JAN: KIRI, don't cry!\n"
- .string "We'll just try harder next time.$"
-
-Text_1864D3:: @ 81864D3
- .string "JAN: You want to battle?\n"
- .string "You don't have enough POKéMON.$"
-
Text_18650B:: @ 818650B
.string "I just got some POKéMON in trades.\n"
.string "Can I try them out on you?$"
@@ -151,3 +120,35 @@ gUnknown_8186A77:: @ 8186A77
.string "ROUTE 15\n"
.string "West to FUCHSIA CITY$"
+Text_186A95:: @ 8186A95
+ .string "MYA: You're perfect.\n"
+ .string "Help me train my little brother?$"
+
+Text_186ACB:: @ 8186ACB
+ .string "MYA: RON, you have to focus!\n"
+ .string "Concentrate on what you're doing!$"
+
+Text_186B0A:: @ 8186B0A
+ .string "MYA: Okay, we'll turn it up.\n"
+ .string "I'll add to our training menu!$"
+
+Text_186B46:: @ 8186B46
+ .string "MYA: Do you want to challenge us?\n"
+ .string "You'll need two POKéMON, though.$"
+
+Text_186B89:: @ 8186B89
+ .string "RON: My sister gets scary when we\n"
+ .string "lose.$"
+
+Text_186BB1:: @ 8186BB1
+ .string "RON: Oh, no, no…\n"
+ .string "Sis, I'm sorry!$"
+
+Text_186BD2:: @ 8186BD2
+ .string "RON: Oh, bleah…\n"
+ .string "I wish I had a nice sister…$"
+
+Text_186BFE:: @ 8186BFE
+ .string "RON: Did you want to battle with\n"
+ .string "my sister and me?\p"
+ .string "You need two POKéMON, then.$"
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
index 289b80db9..5131934b1 100644
--- a/data/maps/Route16/text.inc
+++ b/data/maps/Route16/text.inc
@@ -1,36 +1,3 @@
-Text_186A95:: @ 8186A95
- .string "MYA: You're perfect.\n"
- .string "Help me train my little brother?$"
-
-Text_186ACB:: @ 8186ACB
- .string "MYA: RON, you have to focus!\n"
- .string "Concentrate on what you're doing!$"
-
-Text_186B0A:: @ 8186B0A
- .string "MYA: Okay, we'll turn it up.\n"
- .string "I'll add to our training menu!$"
-
-Text_186B46:: @ 8186B46
- .string "MYA: Do you want to challenge us?\n"
- .string "You'll need two POKéMON, though.$"
-
-Text_186B89:: @ 8186B89
- .string "RON: My sister gets scary when we\n"
- .string "lose.$"
-
-Text_186BB1:: @ 8186BB1
- .string "RON: Oh, no, no…\n"
- .string "Sis, I'm sorry!$"
-
-Text_186BD2:: @ 8186BD2
- .string "RON: Oh, bleah…\n"
- .string "I wish I had a nice sister…$"
-
-Text_186BFE:: @ 8186BFE
- .string "RON: Did you want to battle with\n"
- .string "my sister and me?\p"
- .string "You need two POKéMON, then.$"
-
Text_186C4D:: @ 8186C4D
.string "What do you want?$"
@@ -111,3 +78,36 @@ Route16_Text_RouteSign:: @ 8186F98
.string "ROUTE 16\n"
.string "CELADON CITY - FUCHSIA CITY$"
+Text_186FBD:: @ 8186FBD
+ .string "JED: Our love knows no bounds.\n"
+ .string "We're in love and we show it!$"
+
+Text_186FFA:: @ 8186FFA
+ .string "JED: Oh, no!\n"
+ .string "My love has seen me as a loser!$"
+
+Text_187027:: @ 8187027
+ .string "JED: Listen, LEA.\n"
+ .string "You need to focus less on me.$"
+
+Text_187057:: @ 8187057
+ .string "JED: You have just one POKéMON?\n"
+ .string "Is there no love in your heart?$"
+
+Text_187097:: @ 8187097
+ .string "LEA: Sometimes, the intensity of\n"
+ .string "our love scares me.$"
+
+Text_1870CC:: @ 81870CC
+ .string "LEA: Ohh! But JED looks cool\n"
+ .string "even in a loss!$"
+
+Text_1870F9:: @ 81870F9
+ .string "LEA: Ehehe, I'm sorry.\n"
+ .string "JED is so cool.$"
+
+Text_187120:: @ 8187120
+ .string "LEA: Oh, you don't have two\n"
+ .string "POKéMON with you?\p"
+ .string "Doesn't it feel lonely for you or\n"
+ .string "your POKéMON?$"
diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc
index 6627d5cd0..eff5f0726 100644
--- a/data/maps/Route17/text.inc
+++ b/data/maps/Route17/text.inc
@@ -1,37 +1,3 @@
-Text_186FBD:: @ 8186FBD
- .string "JED: Our love knows no bounds.\n"
- .string "We're in love and we show it!$"
-
-Text_186FFA:: @ 8186FFA
- .string "JED: Oh, no!\n"
- .string "My love has seen me as a loser!$"
-
-Text_187027:: @ 8187027
- .string "JED: Listen, LEA.\n"
- .string "You need to focus less on me.$"
-
-Text_187057:: @ 8187057
- .string "JED: You have just one POKéMON?\n"
- .string "Is there no love in your heart?$"
-
-Text_187097:: @ 8187097
- .string "LEA: Sometimes, the intensity of\n"
- .string "our love scares me.$"
-
-Text_1870CC:: @ 81870CC
- .string "LEA: Ohh! But JED looks cool\n"
- .string "even in a loss!$"
-
-Text_1870F9:: @ 81870F9
- .string "LEA: Ehehe, I'm sorry.\n"
- .string "JED is so cool.$"
-
-Text_187120:: @ 8187120
- .string "LEA: Oh, you don't have two\n"
- .string "POKéMON with you?\p"
- .string "Doesn't it feel lonely for you or\n"
- .string "your POKéMON?$"
-
Text_18717E:: @ 818717E
.string "There's no getting rich quick in\n"
.string "battling kids.$"
diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc
index a76ff89d7..7d399f364 100644
--- a/data/maps/Route19/text.inc
+++ b/data/maps/Route19/text.inc
@@ -117,3 +117,38 @@ gUnknown_8187C06:: @ 8187C06
.string "SEA ROUTE 19\n"
.string "FUCHSIA CITY - SEAFOAM ISLANDS$"
+Text_187C32:: @ 8187C32
+ .string "LIA: I'm looking after my brother.\n"
+ .string "He just became a TRAINER.$"
+
+Text_187C6F:: @ 8187C6F
+ .string "LIA: That's no way to treat my\n"
+ .string "little brother!$"
+
+Text_187C9E:: @ 8187C9E
+ .string "LIA: Do you have a younger\n"
+ .string "brother?\p"
+ .string "I hope you're teaching him all\n"
+ .string "sorts of things.$"
+
+Text_187CF2:: @ 8187CF2
+ .string "LIA: I want to battle together\n"
+ .string "with my little brother.\p"
+ .string "Don't you have two POKéMON?$"
+
+Text_187D45:: @ 8187D45
+ .string "LUC: My big sis taught me how\n"
+ .string "to swim and train POKéMON.$"
+
+Text_187D7E:: @ 8187D7E
+ .string "LUC: Oh, wow!\n"
+ .string "Someone tougher than my big sis!$"
+
+Text_187DAD:: @ 8187DAD
+ .string "LUC: My big sis is strong and nice.\n"
+ .string "I think she's awesome!$"
+
+Text_187DE8:: @ 8187DE8
+ .string "LUC: I don't want to if I can't\n"
+ .string "battle you with my big sis.\p"
+ .string "Don't you have two POKéMON?$"
diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc
index 070575cc7..3abceaeba 100644
--- a/data/maps/Route20/text.inc
+++ b/data/maps/Route20/text.inc
@@ -1,39 +1,3 @@
-Text_187C32:: @ 8187C32
- .string "LIA: I'm looking after my brother.\n"
- .string "He just became a TRAINER.$"
-
-Text_187C6F:: @ 8187C6F
- .string "LIA: That's no way to treat my\n"
- .string "little brother!$"
-
-Text_187C9E:: @ 8187C9E
- .string "LIA: Do you have a younger\n"
- .string "brother?\p"
- .string "I hope you're teaching him all\n"
- .string "sorts of things.$"
-
-Text_187CF2:: @ 8187CF2
- .string "LIA: I want to battle together\n"
- .string "with my little brother.\p"
- .string "Don't you have two POKéMON?$"
-
-Text_187D45:: @ 8187D45
- .string "LUC: My big sis taught me how\n"
- .string "to swim and train POKéMON.$"
-
-Text_187D7E:: @ 8187D7E
- .string "LUC: Oh, wow!\n"
- .string "Someone tougher than my big sis!$"
-
-Text_187DAD:: @ 8187DAD
- .string "LUC: My big sis is strong and nice.\n"
- .string "I think she's awesome!$"
-
-Text_187DE8:: @ 8187DE8
- .string "LUC: I don't want to if I can't\n"
- .string "battle you with my big sis.\p"
- .string "Don't you have two POKéMON?$"
-
Text_187E40:: @ 8187E40
.string "The water is shallow here.\n"
.string "There are many people swimming.$"
@@ -149,3 +113,8 @@ Text_18827B:: @ 818827B
gUnknown_81882D1:: @ 81882D1
.string "SEAFOAM ISLANDS$"
+Text_1882E1:: @ 81882E1
+ .string "Strong TRAINERS and WATER POKéMON\n"
+ .string "are common sights in these parts.\p"
+ .string "They say that MISTY of the\n"
+ .string "CERULEAN GYM trains here.$"
diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc
index e8fc3223a..ad1ec12d3 100644
--- a/data/maps/Route21_North/text.inc
+++ b/data/maps/Route21_North/text.inc
@@ -1,9 +1,3 @@
-Text_1882E1:: @ 81882E1
- .string "Strong TRAINERS and WATER POKéMON\n"
- .string "are common sights in these parts.\p"
- .string "They say that MISTY of the\n"
- .string "CERULEAN GYM trains here.$"
-
Text_18835A:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc
index d08364a6a..7723ecc89 100644
--- a/data/scripts/trainers.inc
+++ b/data/scripts/trainers.inc
@@ -1,7 +1,7 @@
Route3_EventScript_1A93C9:: @ 81A93C9
trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A93F0
msgbox Text_1835B4, MSGBOX_AUTOCLOSE
end
@@ -14,7 +14,7 @@ EventScript_1A93F0:: @ 81A93F0
Route3_EventScript_1A9407:: @ 81A9407
trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A942E
msgbox Text_1837CF, MSGBOX_AUTOCLOSE
end
@@ -27,7 +27,7 @@ EventScript_1A942E:: @ 81A942E
Route3_EventScript_1A9445:: @ 81A9445
trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A946C
msgbox Text_18351C, MSGBOX_AUTOCLOSE
end
@@ -40,7 +40,7 @@ EventScript_1A946C:: @ 81A946C
Route3_EventScript_1A9483:: @ 81A9483
trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A94AA
msgbox Text_1836D9, MSGBOX_AUTOCLOSE
end
@@ -53,7 +53,7 @@ EventScript_1A94AA:: @ 81A94AA
Route3_EventScript_1A94C1:: @ 81A94C1
trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A94E8
msgbox Text_183849, MSGBOX_AUTOCLOSE
end
@@ -66,7 +66,7 @@ EventScript_1A94E8:: @ 81A94E8
Route3_EventScript_1A94FF:: @ 81A94FF
trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9526
msgbox Text_18364C, MSGBOX_AUTOCLOSE
end
@@ -79,7 +79,7 @@ EventScript_1A9526:: @ 81A9526
Route3_EventScript_1A953D:: @ 81A953D
trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9564
msgbox Text_18374F, MSGBOX_AUTOCLOSE
end
@@ -92,7 +92,7 @@ EventScript_1A9564:: @ 81A9564
Route3_EventScript_1A957B:: @ 81A957B
trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A95A2
msgbox Text_18389C, MSGBOX_AUTOCLOSE
end
@@ -105,7 +105,7 @@ EventScript_1A95A2:: @ 81A95A2
Route4_EventScript_1A95B9:: @ 81A95B9
trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A95E0
msgbox Text_183957, MSGBOX_AUTOCLOSE
end
@@ -118,7 +118,7 @@ EventScript_1A95E0:: @ 81A95E0
Route24_EventScript_1A95F7:: @ 81A95F7
trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A961E
msgbox Text_188FA7, MSGBOX_AUTOCLOSE
end
@@ -131,7 +131,7 @@ EventScript_1A961E:: @ 81A961E
Route24_EventScript_1A9635:: @ 81A9635
trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A965C
msgbox Text_18909E, MSGBOX_AUTOCLOSE
end
@@ -144,7 +144,7 @@ EventScript_1A965C:: @ 81A965C
Route24_EventScript_1A9673:: @ 81A9673
trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A969A
msgbox Text_188F53, MSGBOX_AUTOCLOSE
end
@@ -157,7 +157,7 @@ EventScript_1A969A:: @ 81A969A
Route24_EventScript_1A96B1:: @ 81A96B1
trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A96D8
msgbox Text_188FF9, MSGBOX_AUTOCLOSE
end
@@ -170,7 +170,7 @@ EventScript_1A96D8:: @ 81A96D8
Route24_EventScript_1A96EF:: @ 81A96EF
trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9716
msgbox Text_188EA3, MSGBOX_AUTOCLOSE
end
@@ -183,7 +183,7 @@ EventScript_1A9716:: @ 81A9716
Route24_EventScript_1A972D:: @ 81A972D
trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9754
msgbox Text_188F0A, MSGBOX_AUTOCLOSE
end
@@ -196,7 +196,7 @@ EventScript_1A9754:: @ 81A9754
Route25_EventScript_1A976B:: @ 81A976B
trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9792
msgbox Text_1890F5, MSGBOX_AUTOCLOSE
end
@@ -209,7 +209,7 @@ EventScript_1A9792:: @ 81A9792
Route25_EventScript_1A97A9:: @ 81A97A9
trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A97D0
msgbox Text_1891B3, MSGBOX_AUTOCLOSE
end
@@ -222,7 +222,7 @@ EventScript_1A97D0:: @ 81A97D0
Route25_EventScript_1A97E7:: @ 81A97E7
trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A980E
msgbox Text_1892EF, MSGBOX_AUTOCLOSE
end
@@ -235,7 +235,7 @@ EventScript_1A980E:: @ 81A980E
Route25_EventScript_1A9825:: @ 81A9825
trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A984C
msgbox Text_189281, MSGBOX_AUTOCLOSE
end
@@ -248,7 +248,7 @@ EventScript_1A984C:: @ 81A984C
Route25_EventScript_1A9863:: @ 81A9863
trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A988A
msgbox Text_189378, MSGBOX_AUTOCLOSE
end
@@ -261,7 +261,7 @@ EventScript_1A988A:: @ 81A988A
Route25_EventScript_1A98A1:: @ 81A98A1
trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A98C8
msgbox Text_1893FB, MSGBOX_AUTOCLOSE
end
@@ -274,7 +274,7 @@ EventScript_1A98C8:: @ 81A98C8
Route25_EventScript_1A98DF:: @ 81A98DF
trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9906
msgbox Text_18947E, MSGBOX_AUTOCLOSE
end
@@ -287,7 +287,7 @@ EventScript_1A9906:: @ 81A9906
Route25_EventScript_1A991D:: @ 81A991D
trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9944
msgbox Text_18951C, MSGBOX_AUTOCLOSE
end
@@ -300,7 +300,7 @@ EventScript_1A9944:: @ 81A9944
Route25_EventScript_1A995B:: @ 81A995B
trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9982
msgbox Text_18921D, MSGBOX_AUTOCLOSE
end
@@ -313,7 +313,7 @@ EventScript_1A9982:: @ 81A9982
Route6_EventScript_1A9999:: @ 81A9999
trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A99C0
msgbox Text_183ED4, MSGBOX_AUTOCLOSE
end
@@ -326,7 +326,7 @@ EventScript_1A99C0:: @ 81A99C0
Route6_EventScript_1A99D7:: @ 81A99D7
trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A99FE
msgbox Text_18402B, MSGBOX_AUTOCLOSE
end
@@ -339,7 +339,7 @@ EventScript_1A99FE:: @ 81A99FE
Route6_EventScript_1A9A15:: @ 81A9A15
trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9A3C
msgbox Text_183E3C, MSGBOX_AUTOCLOSE
end
@@ -352,7 +352,7 @@ EventScript_1A9A3C:: @ 81A9A3C
Route6_EventScript_1A9A53:: @ 81A9A53
trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9A7A
msgbox Text_183F51, MSGBOX_AUTOCLOSE
end
@@ -365,7 +365,7 @@ EventScript_1A9A7A:: @ 81A9A7A
Route6_EventScript_1A9A91:: @ 81A9A91
trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9AB8
msgbox Text_183E8D, MSGBOX_AUTOCLOSE
end
@@ -378,7 +378,7 @@ EventScript_1A9AB8:: @ 81A9AB8
Route6_EventScript_1A9ACF:: @ 81A9ACF
trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9AF6
msgbox Text_183FC4, MSGBOX_AUTOCLOSE
end
@@ -388,140 +388,140 @@ EventScript_1A9AF6:: @ 81A9AF6
msgbox Text_183FC4, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9B0D:: @ 81A9B0D
- trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8
+Route11_EventScript_Eddie:: @ 81A9B0D
+ trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieIntro, Route11_Text_EddieDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9B34
- msgbox Text_184FEF, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_EddieRematch
+ msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9B34:: @ 81A9B34
- trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Text_1C1DB5, Text_184FD8
- msgbox Text_184FEF, MSGBOX_AUTOCLOSE
+Route11_EventScript_EddieRematch:: @ 81A9B34
+ trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieRematchIntro, Route11_Text_EddieDefeat
+ msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9B4B:: @ 81A9B4B
- trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B
+Route11_EventScript_Dillon:: @ 81A9B4B
+ trainerbattle_single TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonIntro, Route11_Text_DillonDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9B72
- msgbox Text_1850CF, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_DillonRematch
+ msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9B72:: @ 81A9B72
- trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Text_1C1E1F, Text_18509B
- msgbox Text_1850CF, MSGBOX_AUTOCLOSE
+Route11_EventScript_DillonRematch:: @ 81A9B72
+ trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonRematchIntro, Route11_Text_DillonDefeat
+ msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9B89:: @ 81A9B89
- trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC
+Route11_EventScript_Yasu:: @ 81A9B89
+ trainerbattle_single TRAINER_YOUNGSTER_YASU, Route11_Text_YasuIntro, Route11_Text_YasuDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9BB0
- msgbox Text_1851D2, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_YasuRematch
+ msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9BB0:: @ 81A9BB0
- trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Text_1C1EE2, Text_1851AC
- msgbox Text_1851D2, MSGBOX_AUTOCLOSE
+Route11_EventScript_YasuRematch:: @ 81A9BB0
+ trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Route11_Text_YasuRematchIntro, Route11_Text_YasuDefeat
+ msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9BC7:: @ 81A9BC7
- trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1
+Route11_EventScript_Dave:: @ 81A9BC7
+ trainerbattle_single TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveIntro, Route11_Text_DaveDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9BEE
- msgbox Text_1852E3, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_DaveRematch
+ msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9BEE:: @ 81A9BEE
- trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Text_1C1F40, Text_1852C1
- msgbox Text_1852E3, MSGBOX_AUTOCLOSE
+Route11_EventScript_DaveRematch:: @ 81A9BEE
+ trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveRematchIntro, Route11_Text_DaveDefeat
+ msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9C05:: @ 81A9C05
- trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037
+Route11_EventScript_Braxton:: @ 81A9C05
+ trainerbattle_single TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonIntro, Route11_Text_BraxtonDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9C2C
- msgbox Text_18504A, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_BraxtonRematch
+ msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9C2C:: @ 81A9C2C
- trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Text_1C1DE1, Text_185037
- msgbox Text_18504A, MSGBOX_AUTOCLOSE
+Route11_EventScript_BraxtonRematch:: @ 81A9C2C
+ trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonRematchIntro, Route11_Text_BraxtonDefeat
+ msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9C43:: @ 81A9C43
- trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250
+Route11_EventScript_Bernie:: @ 81A9C43
+ trainerbattle_single TRAINER_ENGINEER_BERNIE, Route11_Text_BernieIntro, Route11_Text_BernieDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9C6A
- msgbox Text_185266, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_BernieRematch
+ msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9C6A:: @ 81A9C6A
- trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Text_1C1F1D, Text_185250
- msgbox Text_185266, MSGBOX_AUTOCLOSE
+Route11_EventScript_BernieRematch:: @ 81A9C6A
+ trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Route11_Text_BernieRematchIntro, Route11_Text_BernieDefeat
+ msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9C81:: @ 81A9C81
- trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15
+Route11_EventScript_Hugo:: @ 81A9C81
+ trainerbattle_single TRAINER_GAMER_HUGO, Route11_Text_HugoIntro, Route11_Text_HugoDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9CA8
- msgbox Text_184F2E, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_HugoRematch
+ msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9CA8:: @ 81A9CA8
- trainerbattle_rematch TRAINER_GAMER_HUGO, Text_1C1D50, Text_184F15
- msgbox Text_184F2E, MSGBOX_AUTOCLOSE
+Route11_EventScript_HugoRematch:: @ 81A9CA8
+ trainerbattle_rematch TRAINER_GAMER_HUGO, Route11_Text_HugoRematchIntro, Route11_Text_HugoDefeat
+ msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9CBF:: @ 81A9CBF
- trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E
+Route11_EventScript_Jasper:: @ 81A9CBF
+ trainerbattle_single TRAINER_GAMER_JASPER, Route11_Text_JasperIntro, Route11_Text_JasperDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9CE6
- msgbox Text_184F8E, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_JasperRematch
+ msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9CE6:: @ 81A9CE6
- trainerbattle_rematch TRAINER_GAMER_JASPER, Text_1C1D79, Text_184F7E
- msgbox Text_184F8E, MSGBOX_AUTOCLOSE
+Route11_EventScript_JasperRematch:: @ 81A9CE6
+ trainerbattle_rematch TRAINER_GAMER_JASPER, Route11_Text_JasperRematchIntro, Route11_Text_JasperDefeat
+ msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9CFD:: @ 81A9CFD
- trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105
+Route11_EventScript_Dirk:: @ 81A9CFD
+ trainerbattle_single TRAINER_GAMER_DIRK, Route11_Text_DirkIntro, Route11_Text_DirkDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9D24
- msgbox Text_185114, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_DirkRematch
+ msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9D24:: @ 81A9D24
- trainerbattle_rematch TRAINER_GAMER_DIRK, Text_1C1E57, Text_185105
- msgbox Text_185114, MSGBOX_AUTOCLOSE
+Route11_EventScript_DirkRematch:: @ 81A9D24
+ trainerbattle_rematch TRAINER_GAMER_DIRK, Route11_Text_DirkRematchIntro, Route11_Text_DirkDefeat
+ msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE
end
-Route11_EventScript_1A9D3B:: @ 81A9D3B
- trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E
+Route11_EventScript_Darian:: @ 81A9D3B
+ trainerbattle_single TRAINER_GAMER_DARIAN, Route11_Text_DarianIntro, Route11_Text_DarianDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9D62
- msgbox Text_185161, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route11_EventScript_DarianRematch
+ msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9D62:: @ 81A9D62
- trainerbattle_rematch TRAINER_GAMER_DARIAN, Text_1C1E9F, Text_18514E
- msgbox Text_185161, MSGBOX_AUTOCLOSE
+Route11_EventScript_DarianRematch:: @ 81A9D62
+ trainerbattle_rematch TRAINER_GAMER_DARIAN, Route11_Text_DarianRematchIntro, Route11_Text_DarianDefeat
+ msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE
end
Route9_EventScript_1A9D79:: @ 81A9D79
trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9DA0
msgbox Text_184A8C, MSGBOX_AUTOCLOSE
end
@@ -534,7 +534,7 @@ EventScript_1A9DA0:: @ 81A9DA0
Route9_EventScript_1A9DB7:: @ 81A9DB7
trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9DDE
msgbox Text_184B3B, MSGBOX_AUTOCLOSE
end
@@ -547,7 +547,7 @@ EventScript_1A9DDE:: @ 81A9DDE
Route9_EventScript_1A9DF5:: @ 81A9DF5
trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9E1C
msgbox Text_184890, MSGBOX_AUTOCLOSE
end
@@ -560,7 +560,7 @@ EventScript_1A9E1C:: @ 81A9E1C
Route9_EventScript_1A9E33:: @ 81A9E33
trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9E5A
msgbox Text_1848DE, MSGBOX_AUTOCLOSE
end
@@ -573,7 +573,7 @@ EventScript_1A9E5A:: @ 81A9E5A
Route9_EventScript_1A9E71:: @ 81A9E71
trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9E98
msgbox Text_1847F0, MSGBOX_AUTOCLOSE
end
@@ -586,7 +586,7 @@ EventScript_1A9E98:: @ 81A9E98
Route9_EventScript_1A9EAF:: @ 81A9EAF
trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9ED6
msgbox Text_184931, MSGBOX_AUTOCLOSE
end
@@ -599,7 +599,7 @@ EventScript_1A9ED6:: @ 81A9ED6
Route9_EventScript_1A9EED:: @ 81A9EED
trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9F14
msgbox Text_184AF1, MSGBOX_AUTOCLOSE
end
@@ -612,7 +612,7 @@ EventScript_1A9F14:: @ 81A9F14
Route9_EventScript_1A9F2B:: @ 81A9F2B
trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9F52
msgbox Text_184A11, MSGBOX_AUTOCLOSE
end
@@ -625,7 +625,7 @@ EventScript_1A9F52:: @ 81A9F52
Route9_EventScript_1A9F69:: @ 81A9F69
trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A9F90
msgbox Text_1849B0, MSGBOX_AUTOCLOSE
end
@@ -635,88 +635,88 @@ EventScript_1A9F90:: @ 81A9F90
msgbox Text_1849B0, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1A9FA7:: @ 81A9FA7
- trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31
+Route10_EventScript_Heidi:: @ 81A9FA7
+ trainerbattle_single TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiIntro, Route10_Text_HeidiDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A9FCE
- msgbox Text_184D4D, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_HeidiRematch
+ msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1A9FCE:: @ 81A9FCE
- trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Text_1C1C9A, Text_184D31
- msgbox Text_184D4D, MSGBOX_AUTOCLOSE
+Route10_EventScript_HeidiRematch:: @ 81A9FCE
+ trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiRematchIntro, Route10_Text_HeidiDefeat
+ msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1A9FE5:: @ 81A9FE5
- trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B
+Route10_EventScript_Carol:: @ 81A9FE5
+ trainerbattle_single TRAINER_PICNICKER_CAROL, Route10_Text_CarolIntro, Route10_Text_CarolDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA00C
- msgbox Text_184E5E, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_CarolRematch
+ msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA00C:: @ 81AA00C
- trainerbattle_rematch TRAINER_PICNICKER_CAROL, Text_1C1D14, Text_184E3B
- msgbox Text_184E5E, MSGBOX_AUTOCLOSE
+Route10_EventScript_CarolRematch:: @ 81AA00C
+ trainerbattle_rematch TRAINER_PICNICKER_CAROL, Route10_Text_CarolRematchIntro, Route10_Text_CarolDefeat
+ msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1AA023:: @ 81AA023
- trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5
+Route10_EventScript_Mark:: @ 81AA023
+ trainerbattle_single TRAINER_POKEMANIAC_MARK, Route10_Text_MarkIntro, Route10_Text_MarkDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA04A
- msgbox Text_184BFB, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_MarkRematch
+ msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA04A:: @ 81AA04A
- trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Text_1C1BFA, Text_184BE5
- msgbox Text_184BFB, MSGBOX_AUTOCLOSE
+Route10_EventScript_MarkRematch:: @ 81AA04A
+ trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Route10_Text_MarkRematchIntro, Route10_Text_MarkDefeat
+ msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1AA061:: @ 81AA061
- trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7
+Route10_EventScript_Herman:: @ 81AA061
+ trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanIntro, Route10_Text_HermanDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA088
- msgbox Text_184CBB, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_HermanRematch
+ msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA088:: @ 81AA088
- trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Text_1C1C76, Text_184CA7
- msgbox Text_184CBB, MSGBOX_AUTOCLOSE
+Route10_EventScript_HermanRematch:: @ 81AA088
+ trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanRematchIntro, Route10_Text_HermanDefeat
+ msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1AA09F:: @ 81AA09F
- trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D
+Route10_EventScript_Clark:: @ 81AA09F
+ trainerbattle_single TRAINER_HIKER_CLARK, Route10_Text_ClarkIntro, Route10_Text_ClarkDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA0C6
- msgbox Text_184C60, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_ClarkRematch
+ msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA0C6:: @ 81AA0C6
- trainerbattle_rematch TRAINER_HIKER_CLARK, Text_1C1C4F, Text_184C2D
- msgbox Text_184C60, MSGBOX_AUTOCLOSE
+Route10_EventScript_ClarkRematch:: @ 81AA0C6
+ trainerbattle_rematch TRAINER_HIKER_CLARK, Route10_Text_ClarkRematchIntro, Route10_Text_ClarkDefeat
+ msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
end
-Route10_EventScript_1AA0DD:: @ 81AA0DD
- trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE
+Route10_EventScript_Trent:: @ 81AA0DD
+ trainerbattle_single TRAINER_HIKER_TRENT, Route10_Text_TrentIntro, Route10_Text_TrentDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA104
- msgbox Text_184DE4, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route10_EventScript_TrentRematch
+ msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA104:: @ 81AA104
- trainerbattle_rematch TRAINER_HIKER_TRENT, Text_1C1CD3, Text_184DCE
- msgbox Text_184DE4, MSGBOX_AUTOCLOSE
+Route10_EventScript_TrentRematch:: @ 81AA104
+ trainerbattle_rematch TRAINER_HIKER_TRENT, Route10_Text_TrentRematchIntro, Route10_Text_TrentDefeat
+ msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE
end
Route8_EventScript_1AA11B:: @ 81AA11B
trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA142
msgbox Text_18421B, MSGBOX_AUTOCLOSE
end
@@ -729,7 +729,7 @@ EventScript_1AA142:: @ 81AA142
Route8_EventScript_1AA159:: @ 81AA159
trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA180
msgbox Text_184350, MSGBOX_AUTOCLOSE
end
@@ -742,7 +742,7 @@ EventScript_1AA180:: @ 81AA180
Route8_EventScript_1AA197:: @ 81AA197
trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA1BE
msgbox Text_1843D2, MSGBOX_AUTOCLOSE
end
@@ -755,7 +755,7 @@ EventScript_1AA1BE:: @ 81AA1BE
Route8_EventScript_1AA1D5:: @ 81AA1D5
trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA1FC
msgbox Text_1844FD, MSGBOX_AUTOCLOSE
end
@@ -768,7 +768,7 @@ EventScript_1AA1FC:: @ 81AA1FC
Route8_EventScript_1AA213:: @ 81AA213
trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA23A
msgbox Text_18410E, MSGBOX_AUTOCLOSE
end
@@ -781,7 +781,7 @@ EventScript_1AA23A:: @ 81AA23A
Route8_EventScript_1AA251:: @ 81AA251
trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA278
msgbox Text_1841C8, MSGBOX_AUTOCLOSE
end
@@ -794,7 +794,7 @@ EventScript_1AA278:: @ 81AA278
Route8_EventScript_1AA28F:: @ 81AA28F
trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA2B6
msgbox Text_1842B3, MSGBOX_AUTOCLOSE
end
@@ -807,7 +807,7 @@ EventScript_1AA2B6:: @ 81AA2B6
Route8_EventScript_1AA2CD:: @ 81AA2CD
trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA2F4
msgbox Text_184162, MSGBOX_AUTOCLOSE
end
@@ -820,7 +820,7 @@ EventScript_1AA2F4:: @ 81AA2F4
Route8_EventScript_1AA30B:: @ 81AA30B
trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA332
msgbox Text_184466, MSGBOX_AUTOCLOSE
end
@@ -833,7 +833,7 @@ EventScript_1AA332:: @ 81AA332
Route8_EventScript_1AA349:: @ 81AA349
trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA374
msgbox Text_1845F2, MSGBOX_AUTOCLOSE
end
@@ -846,7 +846,7 @@ EventScript_1AA374:: @ 81AA374
Route8_EventScript_1AA38F:: @ 81AA38F
trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA3BA
msgbox Text_18468B, MSGBOX_AUTOCLOSE
end
@@ -859,7 +859,7 @@ EventScript_1AA3BA:: @ 81AA3BA
Route8_EventScript_1AA3D5:: @ 81AA3D5
trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA3FC
msgbox Text_184719, MSGBOX_AUTOCLOSE
end
@@ -872,7 +872,7 @@ EventScript_1AA3FC:: @ 81AA3FC
Route8_EventScript_1AA413:: @ 81AA413
trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AA43A
msgbox Text_18477A, MSGBOX_AUTOCLOSE
end
@@ -882,413 +882,413 @@ EventScript_1AA43A:: @ 81AA43A
msgbox Text_18477A, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA451:: @ 81AA451
- trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B
+Route12_EventScript_Ned:: @ 81AA451
+ trainerbattle_single TRAINER_FISHERMAN_NED, Route12_Text_NedIntro, Route12_Text_NedDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA478
- msgbox Text_185432, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_NedRematch
+ msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA478:: @ 81AA478
- trainerbattle_rematch TRAINER_FISHERMAN_NED, Text_1C1F9D, Text_18541B
- msgbox Text_185432, MSGBOX_AUTOCLOSE
+Route12_EventScript_NedRematch:: @ 81AA478
+ trainerbattle_rematch TRAINER_FISHERMAN_NED, Route12_Text_NedRematchIntro, Route12_Text_NedDefeat
+ msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA48F:: @ 81AA48F
- trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475
+Route12_EventScript_Chip:: @ 81AA48F
+ trainerbattle_single TRAINER_FISHERMAN_CHIP, Route12_Text_ChipIntro, Route12_Text_ChipDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA4B6
- msgbox Text_185488, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_ChipRematch
+ msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA4B6:: @ 81AA4B6
- trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Text_1C1FD8, Text_185475
- msgbox Text_185488, MSGBOX_AUTOCLOSE
+Route12_EventScript_ChipRematch:: @ 81AA4B6
+ trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Route12_Text_ChipRematchIntro, Route12_Text_ChipDefeat
+ msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA4CD:: @ 81AA4CD
- trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606
+Route12_EventScript_Hank:: @ 81AA4CD
+ trainerbattle_single TRAINER_FISHERMAN_HANK, Route12_Text_HankIntro, Route12_Text_HankDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA4F4
- msgbox Text_185616, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_HankRematch
+ msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA4F4:: @ 81AA4F4
- trainerbattle_rematch TRAINER_FISHERMAN_HANK, Text_1C209C, Text_185606
- msgbox Text_185616, MSGBOX_AUTOCLOSE
+Route12_EventScript_HankRematch:: @ 81AA4F4
+ trainerbattle_rematch TRAINER_FISHERMAN_HANK, Route12_Text_HankRematchIntro, Route12_Text_HankDefeat
+ msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA50B:: @ 81AA50B
- trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0
+Route12_EventScript_Elliot:: @ 81AA50B
+ trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotIntro, Route12_Text_ElliotDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA532
- msgbox Text_1856DF, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_ElliotRematch
+ msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA532:: @ 81AA532
- trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Text_1C20D4, Text_1856D0
- msgbox Text_1856DF, MSGBOX_AUTOCLOSE
+Route12_EventScript_ElliotRematch:: @ 81AA532
+ trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotRematchIntro, Route12_Text_ElliotDefeat
+ msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA549:: @ 81AA549
- trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744
+Route12_EventScript_Andrew:: @ 81AA549
+ trainerbattle_single TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewIntro, Route12_Text_AndrewDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA570
- msgbox Text_18574D, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_AndrewRematch
+ msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA570:: @ 81AA570
- trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Text_1C2134, Text_185744
- msgbox Text_18574D, MSGBOX_AUTOCLOSE
+Route12_EventScript_AndrewRematch:: @ 81AA570
+ trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewRematchIntro, Route12_Text_AndrewDefeat
+ msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA587:: @ 81AA587
- trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B
+Route12_EventScript_Luca:: @ 81AA587
+ trainerbattle_single TRAINER_ROCKER_LUCA, Route12_Text_LucaIntro, Route12_Text_LucaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA5AE
- msgbox Text_1855A6, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_LucaRematch
+ msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA5AE:: @ 81AA5AE
- trainerbattle_rematch TRAINER_ROCKER_LUCA, Text_1C203B, Text_18559B
- msgbox Text_1855A6, MSGBOX_AUTOCLOSE
+Route12_EventScript_LucaRematch:: @ 81AA5AE
+ trainerbattle_rematch TRAINER_ROCKER_LUCA, Route12_Text_LucaRematchIntro, Route12_Text_LucaDefeat
+ msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA5C5:: @ 81AA5C5
- trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED
+Route12_EventScript_Justin:: @ 81AA5C5
+ trainerbattle_single TRAINER_CAMPER_JUSTIN, Route12_Text_JustinIntro, Route12_Text_JustinDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA5EC
- msgbox Text_1854F2, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_JustinRematch
+ msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA5EC:: @ 81AA5EC
- trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Text_1C2008, Text_1854ED
- msgbox Text_1854F2, MSGBOX_AUTOCLOSE
+Route12_EventScript_JustinRematch:: @ 81AA5EC
+ trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Route12_Text_JustinRematchIntro, Route12_Text_JustinDefeat
+ msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA603:: @ 81AA603
- trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842
+Route12_EventScript_Jes:: @ 81AA603
+ trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA62E
- msgbox Text_18581F, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_JesRematch
+ msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA62E:: @ 81AA62E
- trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C216B, Text_1857F1, Text_185842
- msgbox Text_18581F, MSGBOX_AUTOCLOSE
+Route12_EventScript_JesRematch:: @ 81AA62E
+ trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesRematchIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons
+ msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE
end
-Route12_EventScript_1AA649:: @ 81AA649
- trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908
+Route12_EventScript_Gia:: @ 81AA649
+ trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA674
- msgbox Text_1858E2, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route12_EventScript_GiaRematch
+ msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA674:: @ 81AA674
- trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1C219B, Text_1858D0, Text_185908
- msgbox Text_1858E2, MSGBOX_AUTOCLOSE
+Route12_EventScript_GiaRematch:: @ 81AA674
+ trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaRematchIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons
+ msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA68F:: @ 81AA68F
- trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D
+Route13_EventScript_Jared:: @ 81AA68F
+ trainerbattle_single TRAINER_BIKER_JARED, Route13_Text_JaredIntro, Route13_Text_JaredDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA6B6
- msgbox Text_185D33, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_JaredRematch
+ msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA6B6:: @ 81AA6B6
- trainerbattle_rematch TRAINER_BIKER_JARED, Text_1C236B, Text_185D1D
- msgbox Text_185D33, MSGBOX_AUTOCLOSE
+Route13_EventScript_JaredRematch:: @ 81AA6B6
+ trainerbattle_rematch TRAINER_BIKER_JARED, Route13_Text_JaredRematchIntro, Route13_Text_JaredDefeat
+ msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA6CD:: @ 81AA6CD
- trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F
+Route13_EventScript_Lola:: @ 81AA6CD
+ trainerbattle_single TRAINER_BEAUTY_LOLA, Route13_Text_LolaIntro, Route13_Text_LolaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA6F4
- msgbox Text_185C35, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_LolaRematch
+ msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA6F4:: @ 81AA6F4
- trainerbattle_rematch TRAINER_BEAUTY_LOLA, Text_1C2306, Text_185C1F
- msgbox Text_185C35, MSGBOX_AUTOCLOSE
+Route13_EventScript_LolaRematch:: @ 81AA6F4
+ trainerbattle_rematch TRAINER_BEAUTY_LOLA, Route13_Text_LolaRematchIntro, Route13_Text_LolaDefeat
+ msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA70B:: @ 81AA70B
- trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95
+Route13_EventScript_Sheila:: @ 81AA70B
+ trainerbattle_single TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaIntro, Route13_Text_SheilaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA732
- msgbox Text_185CA8, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_SheilaRematch
+ msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA732:: @ 81AA732
- trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Text_1C2340, Text_185C95
- msgbox Text_185CA8, MSGBOX_AUTOCLOSE
+Route13_EventScript_SheilaRematch:: @ 81AA732
+ trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaRematchIntro, Route13_Text_SheilaDefeat
+ msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA749:: @ 81AA749
- trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E
+Route13_EventScript_Sebastian:: @ 81AA749
+ trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianIntro, Route13_Text_SebastianDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA770
- msgbox Text_1859A2, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_SebastianRematch
+ msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA770:: @ 81AA770
- trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Text_1C21EE, Text_18597E
- msgbox Text_1859A2, MSGBOX_AUTOCLOSE
+Route13_EventScript_SebastianRematch:: @ 81AA770
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianRematchIntro, Route13_Text_SebastianDefeat
+ msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA787:: @ 81AA787
- trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA
+Route13_EventScript_Perry:: @ 81AA787
+ trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryIntro, Route13_Text_PerryDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA7AE
- msgbox Text_185BDB, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_PerryRematch
+ msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA7AE:: @ 81AA7AE
- trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Text_1C22CA, Text_185BCA
- msgbox Text_185BDB, MSGBOX_AUTOCLOSE
+Route13_EventScript_PerryRematch:: @ 81AA7AE
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryRematchIntro, Route13_Text_PerryDefeat
+ msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA7C5:: @ 81AA7C5
- trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B
+Route13_EventScript_Robert:: @ 81AA7C5
+ trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertIntro, Route13_Text_RobertDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA7EC
- msgbox Text_185D89, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_RobertRematch
+ msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA7EC:: @ 81AA7EC
- trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Text_1C2383, Text_185D7B
- msgbox Text_185D89, MSGBOX_AUTOCLOSE
+Route13_EventScript_RobertRematch:: @ 81AA7EC
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertRematchIntro, Route13_Text_RobertDefeat
+ msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA803:: @ 81AA803
- trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48
+Route13_EventScript_Alma:: @ 81AA803
+ trainerbattle_single TRAINER_PICNICKER_ALMA, Route13_Text_AlmaIntro, Route13_Text_AlmaDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA82A
- msgbox Text_185B67, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_AlmaRematch
+ msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA82A:: @ 81AA82A
- trainerbattle_rematch TRAINER_PICNICKER_ALMA, Text_1C2299, Text_185B48
- msgbox Text_185B67, MSGBOX_AUTOCLOSE
+Route13_EventScript_AlmaRematch:: @ 81AA82A
+ trainerbattle_rematch TRAINER_PICNICKER_ALMA, Route13_Text_AlmaRematchIntro, Route13_Text_AlmaDefeat
+ msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA841:: @ 81AA841
- trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC
+Route13_EventScript_Susie:: @ 81AA841
+ trainerbattle_single TRAINER_PICNICKER_SUSIE, Route13_Text_SusieIntro, Route13_Text_SusieDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA868
- msgbox Text_1859F9, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_SusieRematch
+ msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA868:: @ 81AA868
- trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Text_1C220C, Text_1859EC
- msgbox Text_1859F9, MSGBOX_AUTOCLOSE
+Route13_EventScript_SusieRematch:: @ 81AA868
+ trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Route13_Text_SusieRematchIntro, Route13_Text_SusieDefeat
+ msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA87F:: @ 81AA87F
- trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56
+Route13_EventScript_Valerie:: @ 81AA87F
+ trainerbattle_single TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieIntro, Route13_Text_ValerieDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA8A6
- msgbox Text_185A62, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_ValerieRematch
+ msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA8A6:: @ 81AA8A6
- trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Text_1C223C, Text_185A56
- msgbox Text_185A62, MSGBOX_AUTOCLOSE
+Route13_EventScript_ValerieRematch:: @ 81AA8A6
+ trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieRematchIntro, Route13_Text_ValerieDefeat
+ msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE
end
-Route13_EventScript_1AA8BD:: @ 81AA8BD
- trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1
+Route13_EventScript_Gwen:: @ 81AA8BD
+ trainerbattle_single TRAINER_PICNICKER_GWEN, Route13_Text_GwenIntro, Route13_Text_GwenDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA8E4
- msgbox Text_185ADE, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route13_EventScript_GwenRematch
+ msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA8E4:: @ 81AA8E4
- trainerbattle_rematch TRAINER_PICNICKER_GWEN, Text_1C225B, Text_185AC1
- msgbox Text_185ADE, MSGBOX_AUTOCLOSE
+Route13_EventScript_GwenRematch:: @ 81AA8E4
+ trainerbattle_rematch TRAINER_PICNICKER_GWEN, Route13_Text_GwenRematchIntro, Route13_Text_GwenDefeat
+ msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AA8FB:: @ 81AA8FB
- trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362
+Route14_EventScript_Malik:: @ 81AA8FB
+ trainerbattle_single TRAINER_BIKER_MALIK, Route14_Text_MalikIntro, Route14_Text_MalikDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA922
- msgbox Text_18636E, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_MalikRematch
+ msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA922:: @ 81AA922
- trainerbattle_rematch TRAINER_BIKER_MALIK, Text_1C25D6, Text_186362
- msgbox Text_18636E, MSGBOX_AUTOCLOSE
+Route14_EventScript_MalikRematch:: @ 81AA922
+ trainerbattle_rematch TRAINER_BIKER_MALIK, Route14_Text_MalikRematchIntro, Route14_Text_MalikDefeat
+ msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AA939:: @ 81AA939
- trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223
+Route14_EventScript_Lukas:: @ 81AA939
+ trainerbattle_single TRAINER_BIKER_LUKAS, Route14_Text_LukasIntro, Route14_Text_LukasDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA960
- msgbox Text_186239, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_LukasRematch
+ msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA960:: @ 81AA960
- trainerbattle_rematch TRAINER_BIKER_LUKAS, Text_1C2531, Text_186223
- msgbox Text_186239, MSGBOX_AUTOCLOSE
+Route14_EventScript_LukasRematch:: @ 81AA960
+ trainerbattle_rematch TRAINER_BIKER_LUKAS, Route14_Text_LukasRematchIntro, Route14_Text_LukasDefeat
+ msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AA977:: @ 81AA977
- trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291
+Route14_EventScript_Isaac:: @ 81AA977
+ trainerbattle_single TRAINER_BIKER_ISAAC, Route14_Text_IsaacIntro, Route14_Text_IsaacDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA99E
- msgbox Text_18629D, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_IsaacRematch
+ msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA99E:: @ 81AA99E
- trainerbattle_rematch TRAINER_BIKER_ISAAC, Text_1C2572, Text_186291
- msgbox Text_18629D, MSGBOX_AUTOCLOSE
+Route14_EventScript_IsaacRematch:: @ 81AA99E
+ trainerbattle_rematch TRAINER_BIKER_ISAAC, Route14_Text_IsaacRematchIntro, Route14_Text_IsaacDefeat
+ msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AA9B5:: @ 81AA9B5
- trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF
+Route14_EventScript_Gerald:: @ 81AA9B5
+ trainerbattle_single TRAINER_BIKER_GERALD, Route14_Text_GeraldIntro, Route14_Text_GeraldDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AA9DC
- msgbox Text_1862F8, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_GeraldRematch
+ msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AA9DC:: @ 81AA9DC
- trainerbattle_rematch TRAINER_BIKER_GERALD, Text_1C259E, Text_1862EF
- msgbox Text_1862F8, MSGBOX_AUTOCLOSE
+Route14_EventScript_GeraldRematch:: @ 81AA9DC
+ trainerbattle_rematch TRAINER_BIKER_GERALD, Route14_Text_GeraldRematchIntro, Route14_Text_GeraldDefeat
+ msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AA9F3:: @ 81AA9F3
- trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A
+Route14_EventScript_Donald:: @ 81AA9F3
+ trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldIntro, Route14_Text_DonaldDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAA1A
- msgbox Text_18611D, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_DonaldRematch
+ msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAA1A:: @ 81AAA1A
- trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Text_1C24CB, Text_18610A
- msgbox Text_18611D, MSGBOX_AUTOCLOSE
+Route14_EventScript_DonaldRematch:: @ 81AAA1A
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldRematchIntro, Route14_Text_DonaldDefeat
+ msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAA31:: @ 81AAA31
- trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3
+Route14_EventScript_Benny:: @ 81AAA31
+ trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyIntro, Route14_Text_BennyDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAA58
- msgbox Text_1861BE, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_BennyRematch
+ msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAA58:: @ 81AAA58
- trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Text_1C2505, Text_1861B3
- msgbox Text_1861BE, MSGBOX_AUTOCLOSE
+Route14_EventScript_BennyRematch:: @ 81AAA58
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyRematchIntro, Route14_Text_BennyDefeat
+ msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAA6F:: @ 81AAA6F
- trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81
+Route14_EventScript_Carter:: @ 81AAA6F
+ trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterIntro, Route14_Text_CarterDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAA96
- msgbox Text_185E9C, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_CarterRematch
+ msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAA96:: @ 81AAA96
- trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Text_1C23C1, Text_185E81
- msgbox Text_185E9C, MSGBOX_AUTOCLOSE
+Route14_EventScript_CarterRematch:: @ 81AAA96
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterRematchIntro, Route14_Text_CarterDefeat
+ msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAAAD:: @ 81AAAAD
- trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B
+Route14_EventScript_Mitch:: @ 81AAAAD
+ trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchIntro, Route14_Text_MitchDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAAD4
- msgbox Text_185F1A, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_MitchRematch
+ msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAAD4:: @ 81AAAD4
- trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Text_1C23EF, Text_185F0B
- msgbox Text_185F1A, MSGBOX_AUTOCLOSE
+Route14_EventScript_MitchRematch:: @ 81AAAD4
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchRematchIntro, Route14_Text_MitchDefeat
+ msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAAEB:: @ 81AAAEB
- trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE
+Route14_EventScript_Beck:: @ 81AAAEB
+ trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckIntro, Route14_Text_BeckDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAB12
- msgbox Text_185FBB, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_BeckRematch
+ msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAB12:: @ 81AAB12
- trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Text_1C2425, Text_185FAE
- msgbox Text_185FBB, MSGBOX_AUTOCLOSE
+Route14_EventScript_BeckRematch:: @ 81AAB12
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckRematchIntro, Route14_Text_BeckDefeat
+ msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAB29:: @ 81AAB29
- trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C
+Route14_EventScript_Marlon:: @ 81AAB29
+ trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonIntro, Route14_Text_MarlonDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAB50
- msgbox Text_186091, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_MarlonRematch
+ msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAB50:: @ 81AAB50
- trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Text_1C2461, Text_18607C
- msgbox Text_186091, MSGBOX_AUTOCLOSE
+Route14_EventScript_MarlonRematch:: @ 81AAB50
+ trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonRematchIntro, Route14_Text_MarlonDefeat
+ msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AAB67:: @ 81AAB67
- trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E
+Route14_EventScript_Kiri:: @ 81AAB67
+ trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AAB92
- msgbox Text_18640D, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_KiriRematch
+ msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AAB92:: @ 81AAB92
- trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C25FB, Text_1863EA, Text_18642E
- msgbox Text_18640D, MSGBOX_AUTOCLOSE
+Route14_EventScript_KiriRematch:: @ 81AAB92
+ trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriRematchIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons
+ msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE
end
-Route14_EventScript_1AABAD:: @ 81AABAD
- trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3
+Route14_EventScript_Jan:: @ 81AABAD
+ trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1AABD8
- msgbox Text_18649C, MSGBOX_AUTOCLOSE
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route14_EventScript_JanRematch
+ msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE
end
-EventScript_1AABD8:: @ 81AABD8
- trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Text_1C261B, Text_186487, Text_1864D3
- msgbox Text_18649C, MSGBOX_AUTOCLOSE
+Route14_EventScript_JanRematch:: @ 81AABD8
+ trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanRematchIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons
+ msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE
end
Route15_EventScript_1AABF3:: @ 81AABF3
trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAC1A
msgbox Text_1868F1, MSGBOX_AUTOCLOSE
end
@@ -1301,7 +1301,7 @@ EventScript_1AAC1A:: @ 81AAC1A
Route15_EventScript_1AAC31:: @ 81AAC31
trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAC58
msgbox Text_18697C, MSGBOX_AUTOCLOSE
end
@@ -1314,7 +1314,7 @@ EventScript_1AAC58:: @ 81AAC58
Route15_EventScript_1AAC6F:: @ 81AAC6F
trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAC96
msgbox Text_1867DA, MSGBOX_AUTOCLOSE
end
@@ -1327,7 +1327,7 @@ EventScript_1AAC96:: @ 81AAC96
Route15_EventScript_1AACAD:: @ 81AACAD
trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AACD4
msgbox Text_18686F, MSGBOX_AUTOCLOSE
end
@@ -1340,7 +1340,7 @@ EventScript_1AACD4:: @ 81AACD4
Route15_EventScript_1AACEB:: @ 81AACEB
trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAD12
msgbox Text_18668D, MSGBOX_AUTOCLOSE
end
@@ -1353,7 +1353,7 @@ EventScript_1AAD12:: @ 81AAD12
Route15_EventScript_1AAD29:: @ 81AAD29
trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAD50
msgbox Text_18671A, MSGBOX_AUTOCLOSE
end
@@ -1366,7 +1366,7 @@ EventScript_1AAD50:: @ 81AAD50
Route15_EventScript_1AAD67:: @ 81AAD67
trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAD8E
msgbox Text_186A55, MSGBOX_AUTOCLOSE
end
@@ -1379,7 +1379,7 @@ EventScript_1AAD8E:: @ 81AAD8E
Route15_EventScript_1AADA5:: @ 81AADA5
trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AADCC
msgbox Text_18655A, MSGBOX_AUTOCLOSE
end
@@ -1392,7 +1392,7 @@ EventScript_1AADCC:: @ 81AADCC
Route15_EventScript_1AADE3:: @ 81AADE3
trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAE0A
msgbox Text_18661D, MSGBOX_AUTOCLOSE
end
@@ -1405,7 +1405,7 @@ EventScript_1AAE0A:: @ 81AAE0A
Route15_EventScript_1AAE21:: @ 81AAE21
trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAE48
msgbox Text_1869F4, MSGBOX_AUTOCLOSE
end
@@ -1418,7 +1418,7 @@ EventScript_1AAE48:: @ 81AAE48
Route15_EventScript_1AAE5F:: @ 81AAE5F
trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAE8A
msgbox Text_186B0A, MSGBOX_AUTOCLOSE
end
@@ -1431,7 +1431,7 @@ EventScript_1AAE8A:: @ 81AAE8A
Route15_EventScript_1AAEA5:: @ 81AAEA5
trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAED0
msgbox Text_186BD2, MSGBOX_AUTOCLOSE
end
@@ -1444,7 +1444,7 @@ EventScript_1AAED0:: @ 81AAED0
Route16_EventScript_1AAEEB:: @ 81AAEEB
trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAF12
msgbox Text_186C75, MSGBOX_AUTOCLOSE
end
@@ -1457,7 +1457,7 @@ EventScript_1AAF12:: @ 81AAF12
Route16_EventScript_1AAF29:: @ 81AAF29
trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAF50
msgbox Text_186D5A, MSGBOX_AUTOCLOSE
end
@@ -1470,7 +1470,7 @@ EventScript_1AAF50:: @ 81AAF50
Route16_EventScript_1AAF67:: @ 81AAF67
trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAF8E
msgbox Text_186EC7, MSGBOX_AUTOCLOSE
end
@@ -1483,7 +1483,7 @@ EventScript_1AAF8E:: @ 81AAF8E
Route16_EventScript_1AAFA5:: @ 81AAFA5
trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AAFCC
msgbox Text_186CC5, MSGBOX_AUTOCLOSE
end
@@ -1496,7 +1496,7 @@ EventScript_1AAFCC:: @ 81AAFCC
Route16_EventScript_1AAFE3:: @ 81AAFE3
trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB00A
msgbox Text_186D16, MSGBOX_AUTOCLOSE
end
@@ -1509,7 +1509,7 @@ EventScript_1AB00A:: @ 81AB00A
Route16_EventScript_1AB021:: @ 81AB021
trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB048
msgbox Text_186E1C, MSGBOX_AUTOCLOSE
end
@@ -1522,7 +1522,7 @@ EventScript_1AB048:: @ 81AB048
Route16_EventScript_1AB05F:: @ 81AB05F
trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB08A
msgbox Text_187027, MSGBOX_AUTOCLOSE
end
@@ -1535,7 +1535,7 @@ EventScript_1AB08A:: @ 81AB08A
Route16_EventScript_1AB0A5:: @ 81AB0A5
trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB0D0
msgbox Text_1870F9, MSGBOX_AUTOCLOSE
end
@@ -1548,7 +1548,7 @@ EventScript_1AB0D0:: @ 81AB0D0
Route17_EventScript_1AB0EB:: @ 81AB0EB
trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB112
msgbox Text_1872EB, MSGBOX_AUTOCLOSE
end
@@ -1561,7 +1561,7 @@ EventScript_1AB112:: @ 81AB112
Route17_EventScript_1AB129:: @ 81AB129
trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB150
msgbox Text_187333, MSGBOX_AUTOCLOSE
end
@@ -1574,7 +1574,7 @@ EventScript_1AB150:: @ 81AB150
Route17_EventScript_1AB167:: @ 81AB167
trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB18E
msgbox Text_187479, MSGBOX_AUTOCLOSE
end
@@ -1587,7 +1587,7 @@ EventScript_1AB18E:: @ 81AB18E
Route17_EventScript_1AB1A5:: @ 81AB1A5
trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB1CC
msgbox Text_1874C9, MSGBOX_AUTOCLOSE
end
@@ -1600,7 +1600,7 @@ EventScript_1AB1CC:: @ 81AB1CC
Route17_EventScript_1AB1E3:: @ 81AB1E3
trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB20A
msgbox Text_1871BA, MSGBOX_AUTOCLOSE
end
@@ -1613,7 +1613,7 @@ EventScript_1AB20A:: @ 81AB20A
Route17_EventScript_1AB221:: @ 81AB221
trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB248
msgbox Text_18725A, MSGBOX_AUTOCLOSE
end
@@ -1626,7 +1626,7 @@ EventScript_1AB248:: @ 81AB248
Route17_EventScript_1AB25F:: @ 81AB25F
trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB286
msgbox Text_18739F, MSGBOX_AUTOCLOSE
end
@@ -1639,7 +1639,7 @@ EventScript_1AB286:: @ 81AB286
Route17_EventScript_1AB29D:: @ 81AB29D
trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB2C4
msgbox Text_1873FF, MSGBOX_AUTOCLOSE
end
@@ -1652,7 +1652,7 @@ EventScript_1AB2C4:: @ 81AB2C4
Route17_EventScript_1AB2DB:: @ 81AB2DB
trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB302
msgbox Text_187432, MSGBOX_AUTOCLOSE
end
@@ -1665,7 +1665,7 @@ EventScript_1AB302:: @ 81AB302
Route17_EventScript_1AB319:: @ 81AB319
trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB340
msgbox Text_1872A5, MSGBOX_AUTOCLOSE
end
@@ -1678,7 +1678,7 @@ EventScript_1AB340:: @ 81AB340
Route18_EventScript_1AB357:: @ 81AB357
trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB37E
msgbox Text_187677, MSGBOX_AUTOCLOSE
end
@@ -1691,7 +1691,7 @@ EventScript_1AB37E:: @ 81AB37E
Route18_EventScript_1AB395:: @ 81AB395
trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB3BC
msgbox Text_1876C5, MSGBOX_AUTOCLOSE
end
@@ -1704,7 +1704,7 @@ EventScript_1AB3BC:: @ 81AB3BC
Route18_EventScript_1AB3D3:: @ 81AB3D3
trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB3FA
msgbox Text_18772C, MSGBOX_AUTOCLOSE
end
@@ -1717,7 +1717,7 @@ EventScript_1AB3FA:: @ 81AB3FA
Route19_EventScript_1AB411:: @ 81AB411
trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB438
msgbox Text_1877EE, MSGBOX_AUTOCLOSE
end
@@ -1730,7 +1730,7 @@ EventScript_1AB438:: @ 81AB438
Route19_EventScript_1AB44F:: @ 81AB44F
trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB476
msgbox Text_187852, MSGBOX_AUTOCLOSE
end
@@ -1743,7 +1743,7 @@ EventScript_1AB476:: @ 81AB476
Route19_EventScript_1AB48D:: @ 81AB48D
trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB4B4
msgbox Text_1878B1, MSGBOX_AUTOCLOSE
end
@@ -1756,7 +1756,7 @@ EventScript_1AB4B4:: @ 81AB4B4
Route19_EventScript_1AB4CB:: @ 81AB4CB
trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB4F2
msgbox Text_1878FE, MSGBOX_AUTOCLOSE
end
@@ -1769,7 +1769,7 @@ EventScript_1AB4F2:: @ 81AB4F2
Route19_EventScript_1AB509:: @ 81AB509
trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB530
msgbox Text_18795B, MSGBOX_AUTOCLOSE
end
@@ -1782,7 +1782,7 @@ EventScript_1AB530:: @ 81AB530
Route19_EventScript_1AB547:: @ 81AB547
trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB56E
msgbox Text_1879D3, MSGBOX_AUTOCLOSE
end
@@ -1795,7 +1795,7 @@ EventScript_1AB56E:: @ 81AB56E
Route19_EventScript_1AB585:: @ 81AB585
trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB5AC
msgbox Text_187B35, MSGBOX_AUTOCLOSE
end
@@ -1808,7 +1808,7 @@ EventScript_1AB5AC:: @ 81AB5AC
Route19_EventScript_1AB5C3:: @ 81AB5C3
trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB5EA
msgbox Text_187A50, MSGBOX_AUTOCLOSE
end
@@ -1821,7 +1821,7 @@ EventScript_1AB5EA:: @ 81AB5EA
Route19_EventScript_1AB601:: @ 81AB601
trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB628
msgbox Text_187ACA, MSGBOX_AUTOCLOSE
end
@@ -1834,7 +1834,7 @@ EventScript_1AB628:: @ 81AB628
Route19_EventScript_1AB63F:: @ 81AB63F
trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB666
msgbox Text_187B94, MSGBOX_AUTOCLOSE
end
@@ -1847,7 +1847,7 @@ EventScript_1AB666:: @ 81AB666
Route19_EventScript_1AB67D:: @ 81AB67D
trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB6A8
msgbox Text_187C9E, MSGBOX_AUTOCLOSE
end
@@ -1860,7 +1860,7 @@ EventScript_1AB6A8:: @ 81AB6A8
Route19_EventScript_1AB6C3:: @ 81AB6C3
trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB6EE
msgbox Text_187DAD, MSGBOX_AUTOCLOSE
end
@@ -1873,7 +1873,7 @@ EventScript_1AB6EE:: @ 81AB6EE
Route20_EventScript_1AB709:: @ 81AB709
trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB730
msgbox Text_187E83, MSGBOX_AUTOCLOSE
end
@@ -1886,7 +1886,7 @@ EventScript_1AB730:: @ 81AB730
Route20_EventScript_1AB747:: @ 81AB747
trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB76E
msgbox Text_187FFE, MSGBOX_AUTOCLOSE
end
@@ -1899,7 +1899,7 @@ EventScript_1AB76E:: @ 81AB76E
Route20_EventScript_1AB785:: @ 81AB785
trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB7AC
msgbox Text_18806D, MSGBOX_AUTOCLOSE
end
@@ -1912,7 +1912,7 @@ EventScript_1AB7AC:: @ 81AB7AC
Route20_EventScript_1AB7C3:: @ 81AB7C3
trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB7EA
msgbox Text_187F61, MSGBOX_AUTOCLOSE
end
@@ -1925,7 +1925,7 @@ EventScript_1AB7EA:: @ 81AB7EA
Route20_EventScript_1AB801:: @ 81AB801
trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB828
msgbox Text_188139, MSGBOX_AUTOCLOSE
end
@@ -1938,7 +1938,7 @@ EventScript_1AB828:: @ 81AB828
Route20_EventScript_1AB83F:: @ 81AB83F
trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB866
msgbox Text_18827B, MSGBOX_AUTOCLOSE
end
@@ -1951,7 +1951,7 @@ EventScript_1AB866:: @ 81AB866
Route20_EventScript_1AB87D:: @ 81AB87D
trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB8A4
msgbox Text_187EF6, MSGBOX_AUTOCLOSE
end
@@ -1964,7 +1964,7 @@ EventScript_1AB8A4:: @ 81AB8A4
Route20_EventScript_1AB8BB:: @ 81AB8BB
trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB8E2
msgbox Text_1880C8, MSGBOX_AUTOCLOSE
end
@@ -1977,7 +1977,7 @@ EventScript_1AB8E2:: @ 81AB8E2
Route20_EventScript_1AB8F9:: @ 81AB8F9
trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB920
msgbox Text_1881B8, MSGBOX_AUTOCLOSE
end
@@ -1990,7 +1990,7 @@ EventScript_1AB920:: @ 81AB920
Route20_EventScript_1AB937:: @ 81AB937
trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB95E
msgbox Text_187FA3, MSGBOX_AUTOCLOSE
end
@@ -2003,7 +2003,7 @@ EventScript_1AB95E:: @ 81AB95E
Route21_North_EventScript_1AB975:: @ 81AB975
trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB99C
msgbox Text_188389, MSGBOX_AUTOCLOSE
end
@@ -2016,7 +2016,7 @@ EventScript_1AB99C:: @ 81AB99C
Route21_South_EventScript_1AB9B3:: @ 81AB9B3
trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AB9DA
msgbox Text_188632, MSGBOX_AUTOCLOSE
end
@@ -2029,7 +2029,7 @@ EventScript_1AB9DA:: @ 81AB9DA
Route21_North_EventScript_1AB9F1:: @ 81AB9F1
trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABA18
msgbox Text_18841D, MSGBOX_AUTOCLOSE
end
@@ -2042,7 +2042,7 @@ EventScript_1ABA18:: @ 81ABA18
Route21_South_EventScript_1ABA2F:: @ 81ABA2F
trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABA56
msgbox Text_1886C5, MSGBOX_AUTOCLOSE
end
@@ -2055,7 +2055,7 @@ EventScript_1ABA56:: @ 81ABA56
Route21_North_EventScript_1ABA6D:: @ 81ABA6D
trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABA94
msgbox Text_188465, MSGBOX_AUTOCLOSE
end
@@ -2068,7 +2068,7 @@ EventScript_1ABA94:: @ 81ABA94
Route21_South_EventScript_1ABAAB:: @ 81ABAAB
trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABAD2
msgbox Text_1884FF, MSGBOX_AUTOCLOSE
end
@@ -2081,7 +2081,7 @@ EventScript_1ABAD2:: @ 81ABAD2
Route21_South_EventScript_1ABAE9:: @ 81ABAE9
trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABB10
msgbox Text_188555, MSGBOX_AUTOCLOSE
end
@@ -2094,7 +2094,7 @@ EventScript_1ABB10:: @ 81ABB10
Route21_South_EventScript_1ABB27:: @ 81ABB27
trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABB4E
msgbox Text_1885BF, MSGBOX_AUTOCLOSE
end
@@ -2107,7 +2107,7 @@ EventScript_1ABB4E:: @ 81ABB4E
Route21_North_EventScript_1ABB65:: @ 81ABB65
trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABB90
msgbox Text_188734, MSGBOX_AUTOCLOSE
end
@@ -2120,7 +2120,7 @@ EventScript_1ABB90:: @ 81ABB90
Route21_North_EventScript_1ABBAB:: @ 81ABBAB
trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABBD6
msgbox Text_188812, MSGBOX_AUTOCLOSE
end
@@ -2133,7 +2133,7 @@ EventScript_1ABBD6:: @ 81ABBD6
OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1
trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABC18
msgbox Text_189657, MSGBOX_AUTOCLOSE
end
@@ -2146,7 +2146,7 @@ EventScript_1ABC18:: @ 81ABC18
OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F
trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABC56
msgbox Text_1896C1, MSGBOX_AUTOCLOSE
end
@@ -2159,7 +2159,7 @@ EventScript_1ABC56:: @ 81ABC56
OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D
trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABC94
msgbox Text_189740, MSGBOX_AUTOCLOSE
end
@@ -2172,7 +2172,7 @@ EventScript_1ABC94:: @ 81ABC94
OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB
trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABCD2
msgbox Text_1897C5, MSGBOX_AUTOCLOSE
end
@@ -2185,7 +2185,7 @@ EventScript_1ABCD2:: @ 81ABCD2
OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9
trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABD10
msgbox Text_18984B, MSGBOX_AUTOCLOSE
end
@@ -2198,7 +2198,7 @@ EventScript_1ABD10:: @ 81ABD10
OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27
trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABD4E
msgbox Text_1898C4, MSGBOX_AUTOCLOSE
end
@@ -2211,7 +2211,7 @@ EventScript_1ABD4E:: @ 81ABD4E
OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65
trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABD8C
msgbox Text_18992C, MSGBOX_AUTOCLOSE
end
@@ -2224,7 +2224,7 @@ EventScript_1ABD8C:: @ 81ABD8C
OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3
trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABDCA
msgbox Text_189998, MSGBOX_AUTOCLOSE
end
@@ -2237,7 +2237,7 @@ EventScript_1ABDCA:: @ 81ABDCA
OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1
trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABE08
msgbox Text_189A13, MSGBOX_AUTOCLOSE
end
@@ -2250,7 +2250,7 @@ EventScript_1ABE08:: @ 81ABE08
OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F
trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABE46
msgbox Text_189A9F, MSGBOX_AUTOCLOSE
end
@@ -2263,7 +2263,7 @@ EventScript_1ABE46:: @ 81ABE46
OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D
trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABE84
msgbox Text_189B24, MSGBOX_AUTOCLOSE
end
@@ -2276,7 +2276,7 @@ EventScript_1ABE84:: @ 81ABE84
OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B
trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABEC6
msgbox Text_189BA3, MSGBOX_AUTOCLOSE
end
@@ -2289,7 +2289,7 @@ EventScript_1ABEC6:: @ 81ABEC6
OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1
trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABF0C
msgbox Text_189C7E, MSGBOX_AUTOCLOSE
end
@@ -2302,7 +2302,7 @@ EventScript_1ABF0C:: @ 81ABF0C
OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27
trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABF4E
msgbox Text_189DA3, MSGBOX_AUTOCLOSE
end
@@ -2315,7 +2315,7 @@ EventScript_1ABF4E:: @ 81ABF4E
ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65
trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABF8C
msgbox Text_189E9E, MSGBOX_AUTOCLOSE
end
@@ -2328,7 +2328,7 @@ EventScript_1ABF8C:: @ 81ABF8C
ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3
trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ABFCA
msgbox Text_189F21, MSGBOX_AUTOCLOSE
end
@@ -2341,7 +2341,7 @@ EventScript_1ABFCA:: @ 81ABFCA
ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1
trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC008
msgbox Text_189FA8, MSGBOX_AUTOCLOSE
end
@@ -2354,7 +2354,7 @@ EventScript_1AC008:: @ 81AC008
ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F
trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC046
msgbox Text_18A000, MSGBOX_AUTOCLOSE
end
@@ -2367,7 +2367,7 @@ EventScript_1AC046:: @ 81AC046
ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D
trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC084
msgbox Text_18A082, MSGBOX_AUTOCLOSE
end
@@ -2380,7 +2380,7 @@ EventScript_1AC084:: @ 81AC084
ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B
trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC0C6
msgbox Text_18A106, MSGBOX_AUTOCLOSE
end
@@ -2393,7 +2393,7 @@ EventScript_1AC0C6:: @ 81AC0C6
ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1
trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC10C
msgbox Text_18A1B2, MSGBOX_AUTOCLOSE
end
@@ -2406,7 +2406,7 @@ EventScript_1AC10C:: @ 81AC10C
FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127
trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC14E
msgbox Text_18A430, MSGBOX_AUTOCLOSE
end
@@ -2419,7 +2419,7 @@ EventScript_1AC14E:: @ 81AC14E
FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165
trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC18C
msgbox Text_18A4C6, MSGBOX_AUTOCLOSE
end
@@ -2432,7 +2432,7 @@ EventScript_1AC18C:: @ 81AC18C
FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3
trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC1CA
msgbox Text_18A555, MSGBOX_AUTOCLOSE
end
@@ -2445,7 +2445,7 @@ EventScript_1AC1CA:: @ 81AC1CA
FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1
trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC208
msgbox Text_18A601, MSGBOX_AUTOCLOSE
end
@@ -2458,7 +2458,7 @@ EventScript_1AC208:: @ 81AC208
FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F
trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC246
msgbox Text_18A699, MSGBOX_AUTOCLOSE
end
@@ -2471,7 +2471,7 @@ EventScript_1AC246:: @ 81AC246
FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D
trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC284
msgbox Text_18A715, MSGBOX_AUTOCLOSE
end
@@ -2484,7 +2484,7 @@ EventScript_1AC284:: @ 81AC284
FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B
trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC2C2
msgbox Text_18A7AC, MSGBOX_AUTOCLOSE
end
@@ -2497,7 +2497,7 @@ EventScript_1AC2C2:: @ 81AC2C2
FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9
trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC300
msgbox Text_18AB37, MSGBOX_AUTOCLOSE
end
@@ -2510,7 +2510,7 @@ EventScript_1AC300:: @ 81AC300
FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317
trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC33E
msgbox Text_18AEB6, MSGBOX_AUTOCLOSE
end
@@ -2523,7 +2523,7 @@ EventScript_1AC33E:: @ 81AC33E
FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355
trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC37C
msgbox Text_18AF45, MSGBOX_AUTOCLOSE
end
@@ -2536,7 +2536,7 @@ EventScript_1AC37C:: @ 81AC37C
FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393
trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC3BA
msgbox Text_18AFF2, MSGBOX_AUTOCLOSE
end
@@ -2549,7 +2549,7 @@ EventScript_1AC3BA:: @ 81AC3BA
SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1
trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC3F8
msgbox Text_18B451, MSGBOX_AUTOCLOSE
end
@@ -2562,7 +2562,7 @@ EventScript_1AC3F8:: @ 81AC3F8
SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F
trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC436
msgbox Text_18B4D1, MSGBOX_AUTOCLOSE
end
@@ -2575,7 +2575,7 @@ EventScript_1AC436:: @ 81AC436
SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D
trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC474
msgbox Text_18B573, MSGBOX_AUTOCLOSE
end
@@ -2588,7 +2588,7 @@ EventScript_1AC474:: @ 81AC474
SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B
trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC4B6
msgbox Text_18B62E, MSGBOX_AUTOCLOSE
end
@@ -2601,7 +2601,7 @@ EventScript_1AC4B6:: @ 81AC4B6
SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1
trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC4FC
msgbox Text_18B720, MSGBOX_AUTOCLOSE
end
@@ -2614,7 +2614,7 @@ EventScript_1AC4FC:: @ 81AC4FC
SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517
trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC53E
msgbox Text_18B7FD, MSGBOX_AUTOCLOSE
end
@@ -2627,7 +2627,7 @@ EventScript_1AC53E:: @ 81AC53E
SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555
trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC57C
msgbox Text_18B8F7, MSGBOX_AUTOCLOSE
end
@@ -2640,7 +2640,7 @@ EventScript_1AC57C:: @ 81AC57C
SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593
trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC5BA
msgbox Text_18B9A5, MSGBOX_AUTOCLOSE
end
@@ -2653,7 +2653,7 @@ EventScript_1AC5BA:: @ 81AC5BA
SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1
trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC5F8
msgbox Text_18BA57, MSGBOX_AUTOCLOSE
end
@@ -2666,7 +2666,7 @@ EventScript_1AC5F8:: @ 81AC5F8
SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F
trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC636
msgbox Text_18BAE0, MSGBOX_AUTOCLOSE
end
@@ -2679,7 +2679,7 @@ EventScript_1AC636:: @ 81AC636
SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D
trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC678
msgbox Text_18BBF6, MSGBOX_AUTOCLOSE
end
@@ -2692,7 +2692,7 @@ EventScript_1AC678:: @ 81AC678
SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693
trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC6BE
msgbox Text_18BCAE, MSGBOX_AUTOCLOSE
end
@@ -2705,7 +2705,7 @@ EventScript_1AC6BE:: @ 81AC6BE
SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9
trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC700
msgbox Text_18BB8B, MSGBOX_AUTOCLOSE
end
@@ -2718,7 +2718,7 @@ EventScript_1AC700:: @ 81AC700
SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717
trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC73E
msgbox Text_18BEA0, MSGBOX_AUTOCLOSE
end
@@ -2731,7 +2731,7 @@ EventScript_1AC73E:: @ 81AC73E
SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755
trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC77C
msgbox Text_18BF6C, MSGBOX_AUTOCLOSE
end
@@ -2744,7 +2744,7 @@ EventScript_1AC77C:: @ 81AC77C
SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793
trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC7BA
msgbox Text_18C04C, MSGBOX_AUTOCLOSE
end
@@ -2757,7 +2757,7 @@ EventScript_1AC7BA:: @ 81AC7BA
SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1
trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC7F8
msgbox Text_18C0EA, MSGBOX_AUTOCLOSE
end
@@ -2770,7 +2770,7 @@ EventScript_1AC7F8:: @ 81AC7F8
SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F
trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC836
msgbox Text_18C17A, MSGBOX_AUTOCLOSE
end
@@ -2783,7 +2783,7 @@ EventScript_1AC836:: @ 81AC836
SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D
trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC874
msgbox Text_18C20E, MSGBOX_AUTOCLOSE
end
@@ -2796,7 +2796,7 @@ EventScript_1AC874:: @ 81AC874
SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B
trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC8B2
msgbox Text_18C2D5, MSGBOX_AUTOCLOSE
end
@@ -2809,7 +2809,7 @@ EventScript_1AC8B2:: @ 81AC8B2
SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9
trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC8F0
msgbox Text_18C3FF, MSGBOX_AUTOCLOSE
end
@@ -2822,7 +2822,7 @@ EventScript_1AC8F0:: @ 81AC8F0
SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907
trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC932
msgbox Text_18C683, MSGBOX_AUTOCLOSE
end
@@ -2835,7 +2835,7 @@ EventScript_1AC932:: @ 81AC932
SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D
trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC978
msgbox Text_18C773, MSGBOX_AUTOCLOSE
end
@@ -2848,7 +2848,7 @@ EventScript_1AC978:: @ 81AC978
SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993
trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC9BA
msgbox Text_18C4BA, MSGBOX_AUTOCLOSE
end
@@ -2861,7 +2861,7 @@ EventScript_1AC9BA:: @ 81AC9BA
SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1
trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1AC9F8
msgbox Text_18C54B, MSGBOX_AUTOCLOSE
end
@@ -2874,7 +2874,7 @@ EventScript_1AC9F8:: @ 81AC9F8
SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F
trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACA36
msgbox Text_18C5F5, MSGBOX_AUTOCLOSE
end
@@ -2887,7 +2887,7 @@ EventScript_1ACA36:: @ 81ACA36
SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D
trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACA74
msgbox Text_18C8C2, MSGBOX_AUTOCLOSE
end
@@ -2900,7 +2900,7 @@ EventScript_1ACA74:: @ 81ACA74
SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B
trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACAB2
msgbox Text_18C999, MSGBOX_AUTOCLOSE
end
@@ -2913,7 +2913,7 @@ EventScript_1ACAB2:: @ 81ACAB2
SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9
trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACAF0
msgbox Text_18CA9C, MSGBOX_AUTOCLOSE
end
@@ -2926,7 +2926,7 @@ EventScript_1ACAF0:: @ 81ACAF0
SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07
trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACB2E
msgbox Text_18CB6C, MSGBOX_AUTOCLOSE
end
@@ -2939,7 +2939,7 @@ EventScript_1ACB2E:: @ 81ACB2E
SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45
trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACB6C
msgbox Text_18CC09, MSGBOX_AUTOCLOSE
end
@@ -2952,7 +2952,7 @@ EventScript_1ACB6C:: @ 81ACB6C
SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83
trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACBAA
msgbox Text_18CCEA, MSGBOX_AUTOCLOSE
end
@@ -2965,7 +2965,7 @@ EventScript_1ACBAA:: @ 81ACBAA
SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1
trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACBEC
msgbox Text_18CD9C, MSGBOX_AUTOCLOSE
end
@@ -2978,7 +2978,7 @@ EventScript_1ACBEC:: @ 81ACBEC
SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07
trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACC32
msgbox Text_18CE78, MSGBOX_AUTOCLOSE
end
@@ -2991,7 +2991,7 @@ EventScript_1ACC32:: @ 81ACC32
SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D
trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACC74
msgbox Text_18D061, MSGBOX_AUTOCLOSE
end
@@ -3004,7 +3004,7 @@ EventScript_1ACC74:: @ 81ACC74
SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B
trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACCB2
msgbox Text_18D125, MSGBOX_AUTOCLOSE
end
@@ -3017,7 +3017,7 @@ EventScript_1ACCB2:: @ 81ACCB2
SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9
trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACCF0
msgbox Text_18D1E3, MSGBOX_AUTOCLOSE
end
@@ -3030,7 +3030,7 @@ EventScript_1ACCF0:: @ 81ACCF0
SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07
trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_1ACD2E
msgbox Text_18D284, MSGBOX_AUTOCLOSE
end
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index 21a96a964..c73077c3b 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -165,205 +165,205 @@ Text_1C1BBE:: @ 81C1BBE
Text_1C1BDC:: @ 81C1BDC
.string "Go win, my super BUG POKéMON!$"
-Text_1C1BFA:: @ 81C1BFA
+Route10_Text_MarkRematchIntro:: @ 81C1BFA
.string "Wow, you came here again?\n"
.string "Maybe you're a POKéMANIAC, too?\l"
.string "Want to see my collection?$"
-Text_1C1C4F:: @ 81C1C4F
+Route10_Text_ClarkRematchIntro:: @ 81C1C4F
.string "Ha-hahah-ah-ha!\n"
.string "I can't stop sneezing!$"
-Text_1C1C76:: @ 81C1C76
+Route10_Text_HermanRematchIntro:: @ 81C1C76
.string "Hi, kid!\n"
.string "Did I show you my POKéMON?$"
-Text_1C1C9A:: @ 81C1C9A
+Route10_Text_HeidiRematchIntro:: @ 81C1C9A
.string "I went out to a POKéMON GYM again.\p"
.string "…But I lost as usual.$"
-Text_1C1CD3:: @ 81C1CD3
+Route10_Text_TrentRematchIntro:: @ 81C1CD3
.string "Ah!\n"
.string "This mountain air is delicious!\l"
.string "It's so good, I can't leave!$"
-Text_1C1D14:: @ 81C1D14
+Route10_Text_CarolRematchIntro:: @ 81C1D14
.string "My head is starting to spin.\n"
.string "I've been hiking for too long…$"
-Text_1C1D50:: @ 81C1D50
+Route11_Text_HugoRematchIntro:: @ 81C1D50
.string "Win, lose, or draw!\n"
.string "Now for our rematch!$"
-Text_1C1D79:: @ 81C1D79
+Route11_Text_JasperRematchIntro:: @ 81C1D79
.string "Competing is the ultimate thrill.\n"
.string "I still can't get enough!$"
-Text_1C1DB5:: @ 81C1DB5
+Route11_Text_EddieRematchIntro:: @ 81C1DB5
.string "You know, right?\n"
.string "Let's go, but don't cheat!$"
-Text_1C1DE1:: @ 81C1DE1
+Route11_Text_BraxtonRematchIntro:: @ 81C1DE1
.string "Hi, there!\p"
.string "But be careful!\n"
.string "I'm still laying down some cables!$"
-Text_1C1E1F:: @ 81C1E1F
+Route11_Text_DillonRematchIntro:: @ 81C1E1F
.string "I became a TRAINER a while ago.\n"
.string "But, I think I can win.$"
-Text_1C1E57:: @ 81C1E57
+Route11_Text_DirkRematchIntro:: @ 81C1E57
.string "Fwahaha!\n"
.string "I have never lost!\p"
.string "…And if I did, I've forgotten all\n"
.string "about it!$"
-Text_1C1E9F:: @ 81C1E9F
+Route11_Text_DarianRematchIntro:: @ 81C1E9F
.string "I have never won before…\p"
.string "Perhaps I am destined to remain\n"
.string "that way…$"
-Text_1C1EE2:: @ 81C1EE2
+Route11_Text_YasuRematchIntro:: @ 81C1EE2
.string "I'm the best in my class.\n"
.string "I train every morning and night!$"
-Text_1C1F1D:: @ 81C1F1D
+Route11_Text_BernieRematchIntro:: @ 81C1F1D
.string "Keep your eyes out for live wires!$"
-Text_1C1F40:: @ 81C1F40
+Route11_Text_DaveRematchIntro:: @ 81C1F40
.string "I raised my POKéMON carefully.\n"
.string "They should be ready by now.\l"
.string "This time, they should win, too.$"
-Text_1C1F9D:: @ 81C1F9D
+Route12_Text_NedRematchIntro:: @ 81C1F9D
.string "Yeah!\n"
.string "I got a bite, here!\l"
.string "Th-this might be the real thing!$"
-Text_1C1FD8:: @ 81C1FD8
+Route12_Text_ChipRematchIntro:: @ 81C1FD8
.string "You're finally here.\n"
.string "Fishing is a waiting game.$"
-Text_1C2008:: @ 81C2008
+Route12_Text_JustinRematchIntro:: @ 81C2008
.string "Still can't find a MOON STONE…\n"
.string "Have you found one?$"
-Text_1C203B:: @ 81C203B
+Route12_Text_LucaRematchIntro:: @ 81C203B
.string "Electricity has always been my\n"
.string "specialty.\p"
.string "I don't know a thing about POKéMON\n"
.string "of the sea, though.$"
-Text_1C209C:: @ 81C209C
+Route12_Text_HankRematchIntro:: @ 81C209C
.string "The FISHING FOOL vs. POKéMON KID!\n"
.string "Another round, fight!$"
-Text_1C20D4:: @ 81C20D4
+Route12_Text_ElliotRematchIntro:: @ 81C20D4
.string "I love fishing, don't get me wrong.\n"
.string "But, I wish I had more work…\l"
.string "…It's hard to give up fishing!$"
-Text_1C2134:: @ 81C2134
+Route12_Text_AndrewRematchIntro:: @ 81C2134
.string "What's catching?\p"
.string "You'll never know unless you beat\n"
.string "me!$"
-Text_1C216B:: @ 81C216B
+Route12_Text_JesRematchIntro:: @ 81C216B
.string "JES: I'll win here today and\n"
.string "propose to my GIA.$"
-Text_1C219B:: @ 81C219B
+Route12_Text_GiaRematchIntro:: @ 81C219B
.string "GIA: Hey, JES…\n"
.string "I've been waiting a long time now.\p"
.string "If we win today, I'll marry you!$"
-Text_1C21EE:: @ 81C21EE
+Route13_Text_SebastianRematchIntro:: @ 81C21EE
.string "My bird POKéMON remember you!$"
-Text_1C220C:: @ 81C220C
+Route13_Text_SusieRematchIntro:: @ 81C220C
.string "I want to be the best TRAINER \n"
.string "while I'm a kid!$"
-Text_1C223C:: @ 81C223C
+Route13_Text_ValerieRematchIntro:: @ 81C223C
.string "Wow!\n"
.string "You got more cool BADGES!$"
-Text_1C225B:: @ 81C225B
+Route13_Text_GwenRematchIntro:: @ 81C225B
.string "My cutely grown POKéMON wish to\n"
.string "become reacquainted with you.$"
-Text_1C2299:: @ 81C2299
+Route13_Text_AlmaRematchIntro:: @ 81C2299
.string "I cleaned out my savings and\n"
.string "bought more CARBOS.$"
-Text_1C22CA:: @ 81C22CA
+Route13_Text_PerryRematchIntro:: @ 81C22CA
.string "I'm not going to lose this time.\n"
.string "The wind's blowing my way!$"
-Text_1C2306:: @ 81C2306
+Route13_Text_LolaRematchIntro:: @ 81C2306
.string "Oh, you're back?\p"
.string "Sure, I'll play again with you,\n"
.string "sweetie.$"
-Text_1C2340:: @ 81C2340
+Route13_Text_SheilaRematchIntro:: @ 81C2340
.string "Can't you forget that you battled\n"
.string "with me?$"
-Text_1C236B:: @ 81C236B
+Route13_Text_JaredRematchIntro:: @ 81C236B
.string "What're you starin' at?$"
-Text_1C2383:: @ 81C2383
+Route13_Text_RobertRematchIntro:: @ 81C2383
.string "I always go with bird POKéMON.\n"
.string "I've dedicated myself to them.$"
-Text_1C23C1:: @ 81C23C1
+Route14_Text_CarterRematchIntro:: @ 81C23C1
.string "I used TMs to teach good moves\n"
.string "to my POKéMON.$"
-Text_1C23EF:: @ 81C23EF
+Route14_Text_MitchRematchIntro:: @ 81C23EF
.string "My bird POKéMON should be ready\n"
.string "for battle this time.$"
-Text_1C2425:: @ 81C2425
+Route14_Text_BeckRematchIntro:: @ 81C2425
.string "Are you using TMs on POKéMON?\n"
.string "Just holding them is useless.$"
-Text_1C2461:: @ 81C2461
+Route14_Text_MarlonRematchIntro:: @ 81C2461
.string "Have you taught your bird POKéMON\n"
.string "how to FLY?\p"
.string "You'll be able to soar with it into\n"
.string "the sky! Give it a try.$"
-Text_1C24CB:: @ 81C24CB
+Route14_Text_DonaldRematchIntro:: @ 81C24CB
.string "The legend of the winged mirages…\n"
.string "You've heard it, right?$"
-Text_1C2505:: @ 81C2505
+Route14_Text_BennyRematchIntro:: @ 81C2505
.string "I'm really not into it, but okay.\n"
.string "Let's go!$"
-Text_1C2531:: @ 81C2531
+Route14_Text_LukasRematchIntro:: @ 81C2531
.string "Hey!\n"
.string "I remember you!\p"
.string "C'mon, c'mon.\n"
.string "Let's go, let's go, let's go!$"
-Text_1C2572:: @ 81C2572
+Route14_Text_IsaacRematchIntro:: @ 81C2572
.string "You're here again, huh?\n"
.string "Shut up and battle.$"
-Text_1C259E:: @ 81C259E
+Route14_Text_GeraldRematchIntro:: @ 81C259E
.string "We've been riding here because of\n"
.string "the wide-open spaces.$"
-Text_1C25D6:: @ 81C25D6
+Route14_Text_MalikRematchIntro:: @ 81C25D6
.string "POKéMON battle, right?\n"
.string "Cool! Rumble!$"
-Text_1C25FB:: @ 81C25FB
+Route14_Text_KiriRematchIntro:: @ 81C25FB
.string "KIRI: JAN, I hope we win today.$"
-Text_1C261B:: @ 81C261B
+Route14_Text_JanRematchIntro:: @ 81C261B
.string "JAN: KIRI, here we go!\n"
.string "Let's win for sure this time!$"