aboutsummaryrefslogtreecommitdiffstats
path: root/data/text
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2026-01-17 22:38:33 -0600
committerdannye <33dannye@gmail.com>2026-01-17 22:38:33 -0600
commitbc2354dd6626ce28bb9561547ed2107cfa56c18e (patch)
tree5902d4c3389253c76b7c3351e0d7dfecb551c28d /data/text
parentIdentify characters in `_OakSpeechText2B` and `Printer_GetMonStats.IDNo` (#144) (diff)
parentUse macros for `WildMonEncounterSlotChances` (#562) (diff)
downloadpokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.gz
pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.xz
pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/text')
-rw-r--r--data/text/text_2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 31f0edb8..fbf0b236 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -1124,21 +1124,21 @@ _MoveIsDisabledText::
cont "disabled!"
prompt
-_MonName1Text::
+_ActorNameText::
text "<USER>@"
text_end
-_Used1Text::
+_UsedMove1Text::
text_start
line "used @"
text_end
-_Used2Text::
+_UsedMove2Text::
text_start
line "used @"
text_end
-_InsteadText::
+_UsedInsteadText::
text "instead,"
cont "@"
text_end
@@ -1147,23 +1147,23 @@ _MoveNameText::
text_ram wStringBuffer
text "@"
-_ExclamationPoint1Text::
+_EndUsedMove1Text::
text "!"
done
-_ExclamationPoint2Text::
+_EndUsedMove2Text::
text "!"
done
-_ExclamationPoint3Text::
+_EndUsedMove3Text::
text "!"
done
-_ExclamationPoint4Text::
+_EndUsedMove4Text::
text "!"
done
-_ExclamationPoint5Text::
+_EndUsedMove5Text::
text "!"
done