summaryrefslogtreecommitdiff
path: root/src/text
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2018-07-01 16:51:31 -0500
committerdannye <33dannye@gmail.com>2018-07-01 16:51:31 -0500
commit779b0ff472edeff7b0bbb36970cb342c17613f12 (patch)
tree08e69927c058c39a1174bf766b6bfb4c15021e3e /src/text
parent95bf272278db81b661942f05916ae5c00d71d207 (diff)
Clean up previous commit
Diffstat (limited to 'src/text')
-rw-r--r--src/text/text1.asm6
-rw-r--r--src/text/text2.asm2
-rw-r--r--src/text/text_offsets.asm8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index d08ad1c..504dba0 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -386,12 +386,12 @@ Text0059: ; 369dc (d:69dc)
line " Hand Examine Back"
done
-RetreatedPokemonText: ; 36a19 (d:6a19)
+RetreatedToTheBenchText: ; 36a19 (d:6a19)
text TX_RAM2, ""
line "Retreated to the Bench."
done
-RetreatFailedText: ; 36a34 (d:6a34)
+RetreatWasUnsuccessfulText: ; 36a34 (d:6a34)
text TX_RAM2, "'s"
line "Retreat was unsuccessful."
done
@@ -401,7 +401,7 @@ WillUseThePokemonPowerText: ; 36a53 (d:6a53)
line "Pokémon Power ", TX_RAM2, "."
done
-FinishedTurnNoAttackText: ; 36a74 (d:6a74)
+FinishedTurnWithoutAttackingText: ; 36a74 (d:6a74)
text "Finished the Turn"
line "without Attacking."
done
diff --git a/src/text/text2.asm b/src/text/text2.asm
index d02bdbd..2248bea 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -13,7 +13,7 @@ ConfusionCheckDamageText: ; 3807c (e:407c)
line "If Tails, damage to yourself!"
done
-Text00f8: ; 380ac (e:40ac)
+ConfusionCheckRetreatText: ; 380ac (e:40ac)
text "Confusion check!"
line "If Tails, unable to Retreat."
done
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 6187300..bef7afe 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -91,10 +91,10 @@ TextOffsets:: ; 34000 (d:4000)
textpointer TransmitingDataText ; 0x0057
textpointer Text0058 ; 0x0058
textpointer Text0059 ; 0x0059
- textpointer RetreatedPokemonText ; 0x005a
- textpointer RetreatFailedText ; 0x005b
+ textpointer RetreatedToTheBenchText ; 0x005a
+ textpointer RetreatWasUnsuccessfulText ; 0x005b
textpointer WillUseThePokemonPowerText ; 0x005c
- textpointer FinishedTurnNoAttackText ; 0x005d
+ textpointer FinishedTurnWithoutAttackingText ; 0x005d
textpointer Text005e ; 0x005e
textpointer Text005f ; 0x005f
textpointer Text0060 ; 0x0060
@@ -249,7 +249,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer AcidCheckText ; 0x00f5
textpointer TransparencyCheckText ; 0x00f6
textpointer ConfusionCheckDamageText ; 0x00f7
- textpointer Text00f8 ; 0x00f8
+ textpointer ConfusionCheckRetreatText ; 0x00f8
textpointer Text00f9 ; 0x00f9
textpointer Text00fa ; 0x00fa
textpointer Text00fb ; 0x00fb