aboutsummaryrefslogtreecommitdiffstats
path: root/text
diff options
context:
space:
mode:
authorNarishma-gb <194818981+Narishma-gb@users.noreply.github.com>2025-01-30 23:26:55 +0100
committerGitHub <noreply@github.com>2025-01-30 17:26:55 -0500
commit43f21cc4948682b51b4c72bcef38631f95b47bfe (patch)
tree2f647622559fce6bae9d4ebb1d669c5cec3db426 /text
parentConsistently refer to CGB, not GBC (#491) (diff)
downloadpokeyellow-43f21cc4948682b51b4c72bcef38631f95b47bfe.tar.gz
pokeyellow-43f21cc4948682b51b4c72bcef38631f95b47bfe.tar.xz
pokeyellow-43f21cc4948682b51b4c72bcef38631f95b47bfe.zip
Fix some label typos, and add some constants instead of raw numbers (#492)
Diffstat (limited to 'text')
-rw-r--r--text/RocketHideoutB2F.asm6
-rw-r--r--text/RocketHideoutB4F.asm18
-rw-r--r--text/Route8.asm2
-rw-r--r--text/SilphCo6F.asm4
4 files changed, 15 insertions, 15 deletions
diff --git a/text/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm
index 4dffbc3b..5e25c935 100644
--- a/text/RocketHideoutB2F.asm
+++ b/text/RocketHideoutB2F.asm
@@ -1,15 +1,15 @@
-_RocketHideoutB1FRocketBattleText::
+_RocketHideoutB2FRocketBattleText::
text "BOSS said you can"
line "see GHOSTs with"
cont "the SILPH SCOPE!"
done
-_RocketHideoutB1FRocketEndBattleText::
+_RocketHideoutB2FRocketEndBattleText::
text "I"
line "surrender!"
prompt
-_RocketHideoutB1FRocketAfterBattleText::
+_RocketHideoutB2FRocketAfterBattleText::
text "The TEAM ROCKET"
line "HQ has 4 basement"
cont "floors. Can you"
diff --git a/text/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm
index b105b32a..ae16eed7 100644
--- a/text/RocketHideoutB4F.asm
+++ b/text/RocketHideoutB4F.asm
@@ -26,49 +26,49 @@ _RocketHideoutB4FGiovanniHopeWeMeetAgainText::
line "again..."
done
-_RocketHideoutB4FGiovanniBattleText::
+_RocketHideoutB4FRocket1BattleText::
text "I know you! You"
line "ruined our plans"
cont "at MT.MOON!"
done
-_RocketHideoutB4FGiovanniEndBattleText::
+_RocketHideoutB4FRocket1EndBattleText::
text "Burned"
line "again!"
prompt
-_RocketHideoutB4FGiovanniAfterBattleText::
+_RocketHideoutB4FRocket1AfterBattleText::
text "Do you have"
line "something against"
cont "TEAM ROCKET?"
done
-_RocketHideoutB4FRocket1BattleText::
+_RocketHideoutB4FRocket2BattleText::
text "How can you not"
line "see the beauty of"
cont "our evil?"
done
-_RocketHideoutB4FRocket1EndBattleText::
+_RocketHideoutB4FRocket2EndBattleText::
text "Ayaya!"
prompt
-_RocketHideoutB4FRocket1AfterBattleText::
+_RocketHideoutB4FRocket2AfterBattleText::
text "BOSS! I'm sorry I"
line "failed you!"
done
-_RocketHideoutB4FRocket2BattleText::
+_RocketHideoutB4FRocket3BattleText::
text "The elevator"
line "doesn't work? Who"
cont "has the LIFT KEY?"
done
-_RocketHideoutB4FRocket2EndBattleText::
+_RocketHideoutB4FRocket3EndBattleText::
text "No!"
prompt
-_RocketHideoutB4FRocket2AfterBattleText::
+_RocketHideoutB4FRocket3AfterBattleText::
text "Oh no! I dropped"
line "the LIFT KEY!"
done
diff --git a/text/Route8.asm b/text/Route8.asm
index 818a81d6..c66f18ea 100644
--- a/text/Route8.asm
+++ b/text/Route8.asm
@@ -50,7 +50,7 @@ _Route8CooltrainerF1BattleText::
line "I collect them!"
done
-_Route8CooltrainerF21EndBattleText::
+_Route8CooltrainerF1EndBattleText::
text "Why? Why??"
prompt
diff --git a/text/SilphCo6F.asm b/text/SilphCo6F.asm
index 86581c24..83408a50 100644
--- a/text/SilphCo6F.asm
+++ b/text/SilphCo6F.asm
@@ -60,12 +60,12 @@ _SilphCo6FRocket1BattleText::
line "ROCKET BROTHERS!"
done
-_SilphCo6Rocket1EndBattleText::
+_SilphCo6FRocket1EndBattleText::
text "Flame"
line "out!"
prompt
-_SilphCo6Rocket1AfterBattleText::
+_SilphCo6FRocket1AfterBattleText::
text "No matter!"
line "My brothers will"
cont "avenge me!"