summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
Diffstat (limited to 'src/text')
-rw-r--r--src/text/text1.asm20
-rw-r--r--src/text/text2.asm14
-rw-r--r--src/text/text_offsets.asm34
3 files changed, 34 insertions, 34 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index edac289..1cb1e0a 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -290,11 +290,11 @@ DuelistPlacedACardText: ; 367f9 (d:67f9)
line "a <RAMTEXT>."
done
-Text0045: ; 36808 (d:6808)
+UnableToSelectText: ; 36808 (d:6808)
text "Unable to select."
done
-Text0046: ; 3681b (d:681b)
+ColorListText: ; 3681b (d:681b)
text "Grass"
line "Fire"
line "Water"
@@ -303,27 +303,27 @@ Text0046: ; 3681b (d:681b)
line "Psychic"
done
-Text0047: ; 36848 (d:6848)
+GrassSymbolText: ; 36848 (d:6848)
textfw0 "<GRASS>"
done
-Text0048: ; 3684b (d:684b)
+FireSymbolText: ; 3684b (d:684b)
textfw0 "<FIRE>"
done
-Text0049: ; 3684e (d:684e)
+WaterSymbolText: ; 3684e (d:684e)
textfw0 "<WATER>"
done
-Text004a: ; 36851 (d:6851)
+LightningSymbolText: ; 36851 (d:6851)
textfw0 "<LIGHTNING>"
done
-Text004b: ; 36854 (d:6854)
+FightingSymbolText: ; 36854 (d:6854)
textfw0 "<FIGHTING>"
done
-Text004c: ; 36857 (d:6857)
+PsychicSymbolText: ; 36857 (d:6857)
textfw0 "<PSYCHIC>"
done
@@ -945,7 +945,7 @@ Text00c9: ; 37897 (d:7897)
text "No Resistance."
done
-Text00ca: ; 378a7 (d:78a7)
+OnlyOncePerTurnText: ; 378a7 (d:78a7)
text "Only once per turn."
done
@@ -963,7 +963,7 @@ Text00cd: ; 37923 (d:7923)
text "There is no Energy card attached."
done
-Text00ce: ; 37946 (d:7946)
+NoGrassEnergyText: ; 37946 (d:7946)
text "No Grass Energy."
done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index bea4094..1afa4d8 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -146,7 +146,7 @@ Text0112: ; 3860a (e:460a)
line "to change with Conversion 2."
done
-Text0113: ; 38647 (e:4647)
+ChoosePokemonWishToColorChangeText: ; 38647 (e:4647)
text "Choose the Pokémon whose color you"
line "wish to change with Color change."
done
@@ -163,7 +163,7 @@ Text0115: ; 386af (e:46af)
text "<RAMTEXT> to <RAMTEXT>."
done
-Text0116: ; 386d3 (e:46d3)
+ChangedTheColorOfText: ; 386d3 (e:46d3)
text "Changed the color of"
line ""
text "<RAMTEXT> to <RAMTEXT>."
@@ -242,7 +242,7 @@ Text0125: ; 3899f (e:499f)
line "from the Deck."
done
-ChooseAnOddishFromTheDeckText: ; 389cf (e:49cf)
+ChooseAnOddishFromDeckText: ; 389cf (e:49cf)
text "Choose an Oddish"
line "from the Deck."
done
@@ -275,7 +275,7 @@ Text012c: ; 38a83 (e:4a83)
line "Fighting Pokémon"
done
-Text012d: ; 38aa4 (e:4aa4)
+ProcedureForEnergyTransferText: ; 38aa4 (e:4aa4)
text "Procedure for Energy Transfer:"
line ""
line "1. Choose the Pokémon to move Grass"
@@ -289,12 +289,12 @@ Text012d: ; 38aa4 (e:4aa4)
line "4. Press the B Button to end."
done
-Text012e: ; 38b8f (e:4b8f)
+ChooseABellsproutFromDeckText: ; 38b8f (e:4b8f)
text "Choose a Bellsprout"
line "from the Deck."
done
-Text012f: ; 38bb3 (e:4bb3)
+ChooseABellsproutText: ; 38bb3 (e:4bb3)
text "Choose a Bellsprout."
done
@@ -433,7 +433,7 @@ OddishText: ; 392dc (e:52dc)
text "Oddish"
done
-Text0141: ; 392e4 (e:52e4)
+BellsproutText: ; 392e4 (e:52e4)
text "Bellsprout"
done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index a4eac01..e0c3cb8 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -70,14 +70,14 @@ TextOffsets:: ; 34000 (d:4000)
textpointer WillDrawNPrizesText ; 0x0042
textpointer DrewNPrizesText ; 0x0043
textpointer DuelistPlacedACardText ; 0x0044
- textpointer Text0045 ; 0x0045
- textpointer Text0046 ; 0x0046
- textpointer Text0047 ; 0x0047
- textpointer Text0048 ; 0x0048
- textpointer Text0049 ; 0x0049
- textpointer Text004a ; 0x004a
- textpointer Text004b ; 0x004b
- textpointer Text004c ; 0x004c
+ textpointer UnableToSelectText ; 0x0045
+ textpointer ColorListText ; 0x0046
+ textpointer GrassSymbolText ; 0x0047
+ textpointer FireSymbolText ; 0x0048
+ textpointer WaterSymbolText ; 0x0049
+ textpointer LightningSymbolText ; 0x004a
+ textpointer FightingSymbolText ; 0x004b
+ textpointer PsychicSymbolText ; 0x004c
textpointer Text004d ; 0x004d
textpointer KnockOutText ; 0x004e
textpointer DamageToSelfDueToConfusionText ; 0x004f
@@ -203,11 +203,11 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text00c7 ; 0x00c7
textpointer Text00c8 ; 0x00c8
textpointer Text00c9 ; 0x00c9
- textpointer Text00ca ; 0x00ca
+ textpointer OnlyOncePerTurnText ; 0x00ca
textpointer CannotUseDueToStatusText ; 0x00cb
textpointer Text00cc ; 0x00cc
textpointer Text00cd ; 0x00cd
- textpointer Text00ce ; 0x00ce
+ textpointer NoGrassEnergyText ; 0x00ce
textpointer Text00cf ; 0x00cf
textpointer Text00d0 ; 0x00d0
textpointer Text00d1 ; 0x00d1
@@ -276,10 +276,10 @@ TextOffsets:: ; 34000 (d:4000)
textpointer DuelistIsSelectingPokemonToPlaceInArenaText ; 0x0110
textpointer Text0111 ; 0x0111
textpointer Text0112 ; 0x0112
- textpointer Text0113 ; 0x0113
+ textpointer ChoosePokemonWishToColorChangeText ; 0x0113
textpointer Text0114 ; 0x0114
textpointer Text0115 ; 0x0115
- textpointer Text0116 ; 0x0116
+ textpointer ChangedTheColorOfText ; 0x0116
textpointer Text0117 ; 0x0117
textpointer DrawCardsFromTheDeckText ; 0x0118
textpointer CannotDrawCardBecauseNoCardsInDeckText ; 0x0119
@@ -295,16 +295,16 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0123 ; 0x0123
textpointer Text0124 ; 0x0124
textpointer Text0125 ; 0x0125
- textpointer ChooseAnOddishFromTheDeckText ; 0x0126
+ textpointer ChooseAnOddishFromDeckText ; 0x0126
textpointer ChooseAnOddishText ; 0x0127
textpointer Text0128 ; 0x0128
textpointer Text0129 ; 0x0129
textpointer ChooseNidoranFromDeckText ; 0x012a
textpointer ChooseNidoranText ; 0x012b
textpointer Text012c ; 0x012c
- textpointer Text012d ; 0x012d
- textpointer Text012e ; 0x012e
- textpointer Text012f ; 0x012f
+ textpointer ProcedureForEnergyTransferText ; 0x012d
+ textpointer ChooseABellsproutFromDeckText ; 0x012e
+ textpointer ChooseABellsproutText ; 0x012f
textpointer Text0130 ; 0x0130
textpointer Text0131 ; 0x0131
textpointer Text0132 ; 0x0132
@@ -322,7 +322,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text013e ; 0x013e
textpointer NidoranMNidoranFText ; 0x013f
textpointer OddishText ; 0x0140
- textpointer Text0141 ; 0x0141
+ textpointer BellsproutText ; 0x0141
textpointer Text0142 ; 0x0142
textpointer Text0143 ; 0x0143
textpointer Text0144 ; 0x0144