summaryrefslogtreecommitdiff
path: root/text
diff options
context:
space:
mode:
Diffstat (limited to 'text')
-rw-r--r--text/CeladonGym.asm8
-rw-r--r--text/CeruleanGym.asm14
-rw-r--r--text/CinnabarGym.asm54
-rw-r--r--text/FuchsiaGym.asm2
-rw-r--r--text/FuchsiaGym_2.asm8
-rw-r--r--text/PewterGym.asm2
-rw-r--r--text/PewterGym_2.asm16
-rw-r--r--text/SaffronGym.asm14
-rw-r--r--text/VermilionGym_2.asm8
-rw-r--r--text/ViridianGym.asm12
10 files changed, 69 insertions, 69 deletions
diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm
index 5d354bbb..2ea0dc44 100644
--- a/text/CeladonGym.asm
+++ b/text/CeladonGym.asm
@@ -1,4 +1,4 @@
-_CeladonGymText_48a5e::
+_ErikaPreBattleText::
text "Hello. Lovely"
line "weather isn't it?"
cont "It's so pleasant."
@@ -25,7 +25,7 @@ _CeladonGymText_48a5e::
line "shall not lose."
done
-_CeladonGymText_48a63::
+_ReceivedRainbowBadgeText::
text "Oh!"
line "I concede defeat."
@@ -36,7 +36,7 @@ _CeladonGymText_48a63::
line "the RAINBOWBADGE."
prompt
-_CeladonGymText_48a68::
+_ErikaPostBattleAdviceText::
text "You are cataloging"
line "#MON? I must"
cont "say I'm impressed."
@@ -47,7 +47,7 @@ _CeladonGymText_48a68::
cont "unattractive."
done
-_CeladonGymText9::
+_ErikaRainbowBadgeInfoText::
text "The RAINBOWBADGE"
line "will make #MON"
cont "up to L50 obey."
diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm
index d302ec3a..2c90ed15 100644
--- a/text/CeruleanGym.asm
+++ b/text/CeruleanGym.asm
@@ -1,4 +1,4 @@
-_CeruleanGymText_5c7be::
+_MistyPreBattleText::
text "Hi, you're a new"
line "face!"
@@ -17,7 +17,7 @@ _CeruleanGymText_5c7be::
cont "#MON!"
done
-_CeruleanGymText_5c7c3::
+_TM11ExplanationText::
text "TM11 teaches"
line "BUBBLEBEAM!"
@@ -25,7 +25,7 @@ _CeruleanGymText_5c7c3::
line "aquatic #MON!"
done
-_CeruleanGymText_5c7c8::
+_MistyCascadeBadgeInfoText::
text "The CASCADEBADGE"
line "makes all #MON"
cont "up to L30 obey!"
@@ -50,12 +50,12 @@ _ReceivedTM11Text::
line "TM11!@"
text_end
-_CeruleanGymText_5c7d3::
+_TM11NoRoomText::
text "You better make"
line "room for this!"
done
-_CeruleanGymText_5c7d8::
+_ReceivedCascadeBadgeText::
text "Wow!"
line "You're too much!"
@@ -105,7 +105,7 @@ _CeruleanGymAfterBattleText2::
line "someone like you!"
done
-_CeruleanGymText_5c82a::
+_CeruleanGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -123,7 +123,7 @@ _CeruleanGymText_5c82a::
line "electricity!"
done
-_CeruleanGymText_5c82f::
+_CeruleanGymGuidePostBattleText::
text "You beat MISTY!"
line "What'd I tell ya?"
diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm
index bf6cc0fb..00fa7084 100644
--- a/text/CinnabarGym.asm
+++ b/text/CinnabarGym.asm
@@ -1,4 +1,4 @@
-_BlaineBattleText::
+_BlainePreBattleText::
text "Hah!"
para "I am BLAINE! I"
@@ -13,7 +13,7 @@ _BlaineBattleText::
line "have BURN HEAL!"
done
-_BlaineEndBattleText::
+_ReceivedVolcanoBadgeText::
text "I have"
line "burnt out!"
@@ -21,7 +21,7 @@ _BlaineEndBattleText::
line "the VOLCANOBADGE!@"
text_end
-_BlaineFireBlastText::
+_BlainePostBattleAdviceText::
text "FIRE BLAST is the"
line "ultimate fire"
cont "technique!"
@@ -30,7 +30,7 @@ _BlaineFireBlastText::
line "water #MON!"
done
-_BlaineBadgeText::
+_BlaineVolcanoBadgeInfoText::
text "Hah!"
para "The VOLCANOBADGE"
@@ -68,18 +68,18 @@ _TM38NoRoomText::
line "gift!"
done
-_CinnabarGymText_7595f::
+_CinnabarGymBattleText2::
text "Do you know how"
line "hot #MON fire"
cont "breath can get?"
done
-_CinnabarGymText_75964::
+_CinnabarGymEndBattleText2::
text "Yow!"
line "Hot, hot, hot!"
prompt
-_CinnabarGymText_75969::
+_CinnabarGymAfterBattleText2::
text "Fire, or to be"
line "more precise,"
cont "combustion..."
@@ -88,66 +88,66 @@ _CinnabarGymText_75969::
line "blah..."
done
-_CinnabarGymText_75994::
+_CinnabarGymBattleText1::
text "I was a thief, but"
line "I became straight"
cont "as a trainer!"
done
-_CinnabarGymText_75999::
+_CinnabarGymEndBattleText1::
text "I"
line "surrender!"
prompt
-_CinnabarGymText_7599e::
+_CinnabarGymAfterBattleText1::
text "I can't help"
line "stealing other"
cont "people's #MON!"
done
-_CinnabarGymText_759c9::
+_CinnabarGymBattleText3::
text "You can't win!"
line "I have studied"
cont "#MON totally!"
done
-_CinnabarGymText_759ce::
+_CinnabarGymEndBattleText3::
text "Waah!"
line "My studies!"
prompt
-_CinnabarGymText_759d3::
+_CinnabarGymAfterBattleText3::
text "My theories are"
line "too complicated"
cont "for you!"
done
-_CinnabarGymText_759fe::
+_CinnabarGymBattleText4::
text "I just like using"
line "fire #MON!"
done
-_CinnabarGymText_75a03::
+_CinnabarGymEndBattleText4::
text "Too hot"
line "to handle!"
prompt
-_CinnabarGymText_75a08::
+_CinnabarGymAfterBattleText4::
text "I wish there was"
line "a thief #MON!"
cont "I'd use that!"
done
-_CinnabarGymText_75a33::
+_CinnabarGymBattleText5::
text "I know why BLAINE"
line "became a trainer!"
done
-_CinnabarGymText_75a38::
+_CinnabarGymEndBattleText5::
text "Ow!"
prompt
-_CinnabarGymText_75a3d::
+_CinnabarGymAfterBattleText5::
text "BLAINE was lost"
line "in the mountains"
cont "when a fiery bird"
@@ -158,40 +158,40 @@ _CinnabarGymText_75a3d::
cont "his way down!"
done
-_CinnabarGymText_75a68::
+_CinnabarGymBattleText6::
text "I've been to many"
line "GYMs, but this is"
cont "my favorite!"
done
-_CinnabarGymText_75a6d::
+_CinnabarGymEndBattleText6::
text "Yowza!"
line "Too hot!"
prompt
-_CinnabarGymText_75a72::
+_CinnabarGymAfterBattleText6::
text "Us fire #MON"
line "fans like PONYTA"
cont "and NINETALES!"
done
-_CinnabarGymText_75a9d::
+_CinnabarGymBattleText7::
text "Fire is weak"
line "against H2O!"
done
-_CinnabarGymText_75aa2::
+_CinnabarGymEndBattleText7::
text "Oh!"
line "Snuffed out!"
prompt
-_CinnabarGymText_75aa7::
+_CinnabarGymAfterBattleText7::
text "Water beats fire!"
line "But, fire melts"
cont "ice #MON!"
done
-_CinnabarGymText_75ac2::
+_CinnabarGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -206,7 +206,7 @@ _CinnabarGymText_75ac2::
line "some BURN HEALs!"
done
-_CinnabarGymText_75ac7::
+_CinnabarGymGuidePostBattleText::
text "<PLAYER>! You beat"
line "that fire brand!"
done
diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm
index 9108fc79..3b2c01e9 100644
--- a/text/FuchsiaGym.asm
+++ b/text/FuchsiaGym.asm
@@ -16,7 +16,7 @@ _KogaBeforeBattleText::
cont "techniques!"
done
-_KogaAfterBattleText::
+_ReceivedSoulBadgeText::
text "Humph!"
line "You have proven"
cont "your worth!"
diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm
index e8043e24..b6443a5a 100644
--- a/text/FuchsiaGym_2.asm
+++ b/text/FuchsiaGym_2.asm
@@ -1,4 +1,4 @@
-_KogaExplainToxicText::
+_KogaPostBattleAdviceText::
text "When afflicted by"
line "TOXIC, #MON"
cont "suffer more and"
@@ -9,7 +9,7 @@ _KogaExplainToxicText::
line "terrorize foes!"
done
-_FuchsiaGymText9::
+_KogaSoulBadgeInfoText::
text "Now that you have"
line "the SOULBADGE,"
cont "the DEFENSE of"
@@ -170,7 +170,7 @@ _FuchsiaGymAfterBattleText6::
cont "choose?"
done
-_FuchsiaGymText_7564e::
+_FuchsiaGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -187,7 +187,7 @@ _FuchsiaGymText_7564e::
cont "to reach him!"
done
-_FuchsiaGymText_75653::
+_FuchsiaGymGuidePostBattleText::
text "It's amazing how"
line "ninja can terrify"
cont "even now!"
diff --git a/text/PewterGym.asm b/text/PewterGym.asm
index 6426dd72..9114ec7b 100644
--- a/text/PewterGym.asm
+++ b/text/PewterGym.asm
@@ -1,4 +1,4 @@
-_PewterGymText_5c49e::
+_BrockPreBattleText::
text "I'm BROCK!"
line "I'm PEWTER's GYM"
cont "LEADER!"
diff --git a/text/PewterGym_2.asm b/text/PewterGym_2.asm
index b3c079a4..2f651278 100644
--- a/text/PewterGym_2.asm
+++ b/text/PewterGym_2.asm
@@ -1,4 +1,4 @@
-_PewterGymText_5c4a3::
+_BrockPostBattleAdviceText::
text "There are all"
line "kinds of trainers"
cont "in the world!"
@@ -12,7 +12,7 @@ _PewterGymText_5c4a3::
cont "your abilities!"
done
-_TM34PreReceiveText::
+_BeforeReceivedTM34Text::
text "Wait! Take this"
line "with you!"
done
@@ -51,7 +51,7 @@ _TM34NoRoomText::
line "room for this!"
done
-_PewterGymText_5c4bc::
+_ReceivedBoulderBadgeText::
text "I took"
line "you for granted."
@@ -63,7 +63,7 @@ _PewterGymText_5c4bc::
line "the BOULDERBADGE!@"
text_end
-_PewterGymText_5c4c1::
+_BrockBoulerBadgeInfoText::
text_start
para "That's an official"
@@ -102,7 +102,7 @@ _PewterGymAfterBattleText1::
cont "as BROCK!"
done
-_PewterGymText_5c515::
+_PewterGymGuidePreAdviceText::
text "Hiya! I can tell"
line "you have what it"
cont "takes to become a"
@@ -116,12 +116,12 @@ _PewterGymText_5c515::
line "to the top!"
done
-_PewterGymText_5c51a::
+_PewterGymGuideBeginAdviceText::
text "All right! Let's"
line "get happening!"
prompt
-_PewterGymText_5c51f::
+_PewterGymGuideAdviceText::
text "The 1st #MON"
line "out in a match is"
cont "at the top of the"
@@ -139,7 +139,7 @@ _PewterGymText_5c524::
cont "get happening!"
prompt
-_PewterGymText_5c529::
+_PewterGymGuidePostBattleText::
text "Just as I thought!"
line "You're #MON"
cont "champ material!"
diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm
index ae8556c0..090b951a 100644
--- a/text/SaffronGym.asm
+++ b/text/SaffronGym.asm
@@ -1,4 +1,4 @@
-_SaffronGymText_5d162::
+_SabrinaPreBattleText::
text "I had a vision of"
line "your arrival!"
@@ -16,7 +16,7 @@ _SaffronGymText_5d162::
cont "you my powers!"
done
-_SaffronGymText_5d167::
+_ReceivedMarshBadgeText::
text "I'm"
line "shocked!"
cont "But, a loss is a"
@@ -30,14 +30,14 @@ _SaffronGymText_5d167::
line "MARSHBADGE!@"
text_end
-_SaffronGymText_5d16e::
+_SabrinaPostBattleAdviceText::
text "Everyone has"
line "psychic power!"
cont "People just don't"
cont "realize it!"
done
-_SaffronGymText_5d173::
+_KogaMarshBadgeInfoText::
text "The MARSHBADGE"
line "makes #MON up"
cont "to L70 obey you!"
@@ -55,7 +55,7 @@ _SaffronGymText_5d173::
line "this TM with you!"
done
-ReceivedTM46Text::
+_ReceivedTM46Text::
text "<PLAYER> received"
line "TM46!@"
text_end
@@ -74,7 +74,7 @@ _TM46NoRoomText::
line "of other items!"
done
-_SaffronGymText_5d1e6::
+_SaffronGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -91,7 +91,7 @@ _SaffronGymText_5d1e6::
cont "even aim a punch!"
done
-_SaffronGymText_5d1eb::
+_SaffronGymGuidePostBattleText::
text "Psychic power,"
line "huh?"
diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm
index bf50422d..02af599d 100644
--- a/text/VermilionGym_2.asm
+++ b/text/VermilionGym_2.asm
@@ -10,7 +10,7 @@ _LTSurgePostBattleAdviceText::
cont "type #MON!"
done
-_LTSurgeThunderbadgeInfoText::
+_LTSurgeThunderBadgeInfoText::
text "The THUNDERBADGE"
line "cranks up your"
cont "#MON's SPEED!"
@@ -45,7 +45,7 @@ _TM24NoRoomText::
line "in your pack!"
done
-_ReceivedThunderbadgeText::
+_ReceivedThunderBadgeText::
text "Whoa!"
para "You're the real"
@@ -113,7 +113,7 @@ _VermilionGymAfterBattleText3::
cont "next to it!"
done
-_VermilionGymFanPreBattleText::
+_VermilionGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -139,7 +139,7 @@ _VermilionGymFanPreBattleText::
cont "get to him!"
done
-_VermilionGymFanPostBattleText::
+_VermilionGymGuidePostBattleText::
text "Whew! That match"
line "was electric!"
done
diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm
index 2b1f67ae..feac7963 100644
--- a/text/ViridianGym.asm
+++ b/text/ViridianGym.asm
@@ -1,4 +1,4 @@
-_ViridianGymText_74ace::
+_GiovanniPreBattleText::
text "Fwahahaha! This is"
line "my hideout!"
@@ -18,7 +18,7 @@ _ViridianGymText_74ace::
cont "greatest trainer!"
done
-_ViridianGymText_74ad3::
+_ReceivedEarthBadgeText::
text "Ha!"
line "That was a truly"
cont "intense fight!"
@@ -27,7 +27,7 @@ _ViridianGymText_74ad3::
cont "the EARTHBADGE!@"
text_end
-_ViridianGymText_74ad9::
+_GiovanniPostBattleAdviceText::
text "Having lost, I"
line "cannot face my"
cont "underlings!"
@@ -43,7 +43,7 @@ _ViridianGymText_74ad9::
cont "Farewell!@"
text_end
-_ViridianGymText12::
+_GiovanniEarthBadgeInfoText::
text "The EARTHBADGE"
line "makes #MON of"
cont "any level obey!"
@@ -215,7 +215,7 @@ _ViridianGymAfterBattleText8::
cont "our GYM LEADER!"
done
-_ViridianGymText_74bd4::
+_ViridianGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@@ -233,7 +233,7 @@ _ViridianGymText_74bd4::
cont "#MON!"
done
-_ViridianGymText_74bd9::
+_ViridianGymGuidePostBattleText::
text "Blow me away!"
line "GIOVANNI was the"
cont "GYM LEADER here?"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 20:01:42 +0000