Merge branch 'master' of https://github.com/pret/pokered

8 files changed, 37 insertions, 39 deletions

diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index eb394afe..7dac6d4f 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 dd74bd79..02d2908a 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -27,7 +27,7 @@ _BoxWillBeClearedText::
 	done
 
 _TradeWentToText::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text " went"
 	line "to @"
 	text_ram wLinkEnemyTrainerName
@@ -37,7 +37,7 @@ _TradeWentToText::
 _TradeForText::
 	text "For <PLAYER>'s"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text ","
 	done
 
@@ -79,7 +79,7 @@ _TradeWillTradeText::
 _TradeforText::
 	text "for <PLAYER>'s"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "."
 	done
 
@@ -115,7 +115,7 @@ _OneMoreGoSlotMachineText::
 _LinedUpText::
 	text " lined up!"
 	line "Scored @"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text " coins!"
 	done
 
@@ -1143,8 +1143,8 @@ _InsteadText::
 	cont "@"
 	text_end
 
-_CF4BText::
-	text_ram wcf4b
+_MoveNameText::
+	text_ram wStringBuffer
 	text "@"
 
 _ExclamationPoint1Text::
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index bd418402..832559f8 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -295,7 +295,7 @@ _DepositWhichMonText::
 	done
 
 _MonWasStoredText::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text " was"
 	line "stored in Box @"
 	text_ram wBoxNumString
@@ -313,11 +313,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
 
@@ -348,19 +348,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_4.asm b/data/text/text_4.asm
index 4c3d6a9c..fd5caad2 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -37,7 +37,7 @@ _ChooseABoxText::
 	text_end
 
 _EvolvedText::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text " evolved"
 	done
 
@@ -50,7 +50,7 @@ _IntoText::
 
 _StoppedEvolvingText::
 	text "Huh? @"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text_start
 	line "stopped evolving!"
 	prompt
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index fc758be9..78ee7b61 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -1,6 +1,6 @@
 _IsEvolvingText::
 	text "What? @"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text_start
 	line "is evolving!"
 	done
@@ -43,7 +43,7 @@ _FireDefrostedText::
 _MonsStatsRoseText::
 	text "<USER>'s"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "@"
 	text_end
 
@@ -58,7 +58,7 @@ _RoseText::
 _MonsStatsFellText::
 	text "<TARGET>'s"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "@"
 	text_end
 
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index 88c7d884..ddc51d59 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -31,7 +31,7 @@ _PokemartBuyingGreetingText::
 	done
 
 _PokemartTellBuyPriceText::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "?"
 	line "That will be"
 	cont "¥@"
@@ -89,7 +89,7 @@ _LearnedMove1Text::
 	text_ram wLearnMoveMonName
 	text " learned"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!@"
 	text_end
 
@@ -101,7 +101,7 @@ _WhichMoveToForgetText::
 _AbandonLearningText::
 	text "Abandon learning"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "?"
 	done
 
@@ -110,7 +110,7 @@ _DidNotLearnText::
 	text_start
 	line "did not learn"
 	cont "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!"
 	prompt
 
@@ -119,7 +119,7 @@ _TryingToLearnText::
 	text " is"
 	line "trying to learn"
 	cont "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!"
 
 	para "But, @"
@@ -131,7 +131,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_8.asm b/data/text/text_8.asm
index d8d11d50..12550c8e 100644
--- a/data/text/text_8.asm
+++ b/data/text/text_8.asm
@@ -101,7 +101,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_9.asm b/data/text/text_9.asm
index a5aff49c..bb00403b 100644
--- a/data/text/text_9.asm
+++ b/data/text/text_9.asm
@@ -78,7 +78,7 @@ _VitaminStatRoseText::
 	text_ram wcd6d
 	text "'s"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text " rose."
 	prompt
 
@@ -144,13 +144,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
@@ -170,11 +170,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
@@ -184,12 +184,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
 
@@ -246,7 +246,7 @@ _ItemUseText001::
 	text_end
 
 _ItemUseText002::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!"
 	done
 
@@ -255,7 +255,7 @@ _GotOnBicycleText1::
 	text_end
 
 _GotOnBicycleText2::
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!"
 	prompt
 
@@ -265,7 +265,7 @@ _GotOffBicycleText1::
 
 _GotOffBicycleText2::
 	text "the @"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "."
 	prompt
 
@@ -279,7 +279,7 @@ _ThrewAwayItemText::
 _IsItOKToTossItemText::
 	text "Is it OK to toss"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "?"
 	prompt
 
@@ -292,7 +292,7 @@ _AlreadyKnowsText::
 	text_ram wcd6d
 	text " knows"
 	line "@"
-	text_ram wcf4b
+	text_ram wStringBuffer
 	text "!"
 	prompt