summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/text/text_1.asm2
-rw-r--r--data/text/text_2.asm26
-rw-r--r--data/text/text_3.asm10
-rw-r--r--data/text/text_4.asm12
-rw-r--r--data/text/text_5.asm2
-rw-r--r--data/text/text_6.asm14
-rw-r--r--data/text/text_7.asm10
7 files changed, 37 insertions, 39 deletions
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index af1d3827..2acc6f68 100644
--- a/data/text/text_1.asm
+++ b/data/text/text_1.asm
@@ -60,7 +60,7 @@ _PokeCenterSignText::
_FoundItemText::
text "<PLAYER> found"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!@"
text_end
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 230a38f0..6720021c 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -18,7 +18,7 @@ _AIBattleUseItemText::
prompt
_TradeWentToText::
- text_ram wcf4b
+ text_ram wStringBuffer
text " went"
line "to @"
text_ram wLinkEnemyTrainerName
@@ -28,7 +28,7 @@ _TradeWentToText::
_TradeForText::
text "For <PLAYER>'s"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text ","
done
@@ -70,7 +70,7 @@ _TradeWillTradeText::
_TradeforText::
text "for <PLAYER>'s"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "."
done
@@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText::
_LinedUpText::
text " lined up!"
line "Scored @"
- text_ram wcf4b
+ text_ram wStringBuffer
text " coins!"
done
@@ -1094,8 +1094,8 @@ _InsteadText::
cont "@"
text_end
-_CF4BText::
- text_ram wcf4b
+_MoveNameText::
+ text_ram wStringBuffer
text "@"
_ExclamationPoint1Text::
@@ -1559,7 +1559,7 @@ _DepositWhichMonText::
done
_MonWasStoredText::
- text_ram wcf4b
+ text_ram wStringBuffer
text " was"
line "stored in Box @"
text_ram wBoxNumString
@@ -1577,11 +1577,11 @@ _BoxFullText::
prompt
_MonIsTakenOutText::
- text_ram wcf4b
+ text_ram wStringBuffer
text " is"
line "taken out."
cont "Got @"
- text_ram wcf4b
+ text_ram wStringBuffer
text "."
prompt
@@ -1606,19 +1606,17 @@ _ReleaseWhichMonText::
_OnceReleasedText::
text "Once released,"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text " is"
cont "gone forever. OK?"
done
_MonWasReleasedText::
- text_ram wcf4b
+ text_ram wStringBuffer
text " was"
line "released outside."
cont "Bye @"
-
-_CF4BExclamationText::
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
prompt
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index 6407dce7..daae6fb5 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -33,7 +33,7 @@ _ChooseABoxText::
text_end
_EvolvedText::
- text_ram wcf4b
+ text_ram wStringBuffer
text " evolved"
done
@@ -46,14 +46,14 @@ _IntoText::
_StoppedEvolvingText::
text "Huh? @"
- text_ram wcf4b
+ text_ram wStringBuffer
text_start
line "stopped evolving!"
prompt
_IsEvolvingText::
text "What? @"
- text_ram wcf4b
+ text_ram wStringBuffer
text_start
line "is evolving!"
done
@@ -96,7 +96,7 @@ _FireDefrostedText::
_MonsStatsRoseText::
text "<USER>'s"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "@"
text_end
@@ -111,7 +111,7 @@ _RoseText::
_MonsStatsFellText::
text "<TARGET>'s"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "@"
text_end
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
index 4c01b5f4..6a472dc2 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -27,7 +27,7 @@ _PokemartBuyingGreetingText::
done
_PokemartTellBuyPriceText::
- text_ram wcf4b
+ text_ram wStringBuffer
text "?"
line "That will be"
cont "¥@"
@@ -85,7 +85,7 @@ _LearnedMove1Text::
text_ram wLearnMoveMonName
text " learned"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!@"
text_end
@@ -97,7 +97,7 @@ _WhichMoveToForgetText::
_AbandonLearningText::
text "Abandon learning"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "?"
done
@@ -106,7 +106,7 @@ _DidNotLearnText::
text_start
line "did not learn"
cont "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
prompt
@@ -115,7 +115,7 @@ _TryingToLearnText::
text " is"
line "trying to learn"
cont "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
para "But, @"
@@ -127,7 +127,7 @@ _TryingToLearnText::
para "Delete an older"
line "move to make room"
cont "for @"
- text_ram wcf4b
+ text_ram wStringBuffer
text "?"
done
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index ae7151cc..fb0cac66 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -87,7 +87,7 @@ _SentToBoxText::
text " was"
cont "sent to #MON"
cont "BOX @"
- text_ram wcf4b
+ text_ram wStringBuffer
text " on PC!"
done
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
index 39eb22ea..194afa7b 100644
--- a/data/text/text_6.asm
+++ b/data/text/text_6.asm
@@ -72,7 +72,7 @@ _VitaminStatRoseText::
text_ram wcd6d
text "'s"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text " rose."
prompt
@@ -138,13 +138,13 @@ _RestorePPWhichTechniqueText::
done
_PPMaxedOutText::
- text_ram wcf4b
+ text_ram wStringBuffer
text "'s PP"
line "is maxed out."
prompt
_PPIncreasedText::
- text_ram wcf4b
+ text_ram wStringBuffer
text "'s PP"
line "increased."
prompt
@@ -164,11 +164,11 @@ _BootedUpHMText::
_TeachMachineMoveText::
text "It contained"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
para "Teach @"
- text_ram wcf4b
+ text_ram wStringBuffer
text_start
line "to a #MON?"
done
@@ -178,12 +178,12 @@ _MonCannotLearnMachineMoveText::
text " is not"
line "compatible with"
cont "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "."
para "It can't learn"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "."
prompt
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index 34f070bd..fcb27d20 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -3,7 +3,7 @@ _ItemUseText001::
text_end
_ItemUseText002::
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
done
@@ -12,7 +12,7 @@ _GotOnBicycleText1::
text_end
_GotOnBicycleText2::
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
prompt
@@ -22,7 +22,7 @@ _GotOffBicycleText1::
_GotOffBicycleText2::
text "the @"
- text_ram wcf4b
+ text_ram wStringBuffer
text "."
prompt
@@ -36,7 +36,7 @@ _ThrewAwayItemText::
_IsItOKToTossItemText::
text "Is it OK to toss"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "?"
prompt
@@ -49,7 +49,7 @@ _AlreadyKnowsText::
text_ram wcd6d
text " knows"
line "@"
- text_ram wcf4b
+ text_ram wStringBuffer
text "!"
prompt