Resolve issue #575: Rename text commands

19 files changed, 39 insertions, 37 deletions

diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ee551c851..ca9609804 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -525,11 +525,11 @@ Text_AskRegisterRecord_Mobile:
 Text_PlayerGotFive:
 	text "<PLAYER> got five"
 	line "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text "!@"
 	sound_item
 	text_waitbutton
-	db "@"
+	text_end
 
 Text_YourPackIsStuffedFull:
 	text "Oops, your PACK is"
@@ -635,7 +635,7 @@ Text_YourMonWillBeHealedToFullHealth:
 Text_NextUpOpponentNo:
 	text "Next up, opponent"
 	line "no.@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text ". Ready?"
 	done
 
@@ -734,19 +734,19 @@ Text_AMonLevelExceeds:
 	text "One or more of"
 	line "your #MON's"
 	cont "levels exceeds @"
-	deciram wScriptVar, 1, 3
+	text_decimal wScriptVar, 1, 3
 	text "."
 	done
 
 Text_MayNotEnterABattleRoomUnderL70:
-	text_from_ram wcd49
+	text_ram wcd49
 	text " may not"
 	line "enter a BATTLE"
 	cont "ROOM under L70."
 
 	para "This BATTLE ROOM"
 	line "is for L@"
-	deciram wScriptVar, 1, 3
+	text_decimal wScriptVar, 1, 3
 	text "."
 	done
 
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index ff83b7979..69a7fda78 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -239,7 +239,7 @@ BillsGrandpaYouDontHaveItTextText:
 BillsGrandpaShownPokemonText:
 	text "Ah, so that is"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 
 	para "Isn't it cute!"
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index e402d0c9a..27d46e076 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -104,7 +104,7 @@ DaisyAlrightText:
 	done
 
 GroomedMonLooksContentText:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " looks"
 	line "content."
 	done
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 89588ddd3..c3a65d67f 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -196,7 +196,7 @@ EatathonContestPosterText:
 FoundLeftoversText:
 	text "<PLAYER> found"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "!"
 	done
 
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index bc67437e5..2051c01dd 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -107,7 +107,7 @@ CeladonClangText:
 	text "Clang!"
 
 	para "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	line "popped out."
 	done
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index fdeeefc3c..24846a784 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -233,7 +233,7 @@ CeladonPrizeRoom_AskWhichPrizeText:
 CeladonPrizeRoom_ConfirmPurchaseText:
 	text "OK, so you wanted"
 	line "a @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "?"
 	done
 
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 918e82904..88429d132 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -393,7 +393,7 @@ TwinsLeaandpia2AfterBattleText:
 Text_FoundDragonFang:
 	text "<PLAYER> found"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "!"
 	done
 
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index d2cf87d2f..17a6d42f1 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -891,7 +891,7 @@ ChoseStarterText:
 ReceivedStarterText:
 	text "<PLAYER> received"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "!"
 	done
 
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index fa21f5e92..347e8b27a 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -100,7 +100,7 @@ GoldenrodVendingText:
 GoldenrodClangText:
 	text "Clang! A can of"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	cont "popped out!"
 	done
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index fbffa8229..608b41d33 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -326,7 +326,7 @@ GoldenrodGameCornerPrizeVendorWhichPrizeText:
 	done
 
 GoldenrodGameCornerPrizeVendorConfirmPrizeText:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 	line "Is that right?"
 	done
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 2b2093a29..0918b6b79 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -78,7 +78,7 @@ GoldenrodHappinessRaterTeacherText:
 
 	para "Oh? Let me see"
 	line "your @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "…"
 	done
 
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 20cf07506..5a6087f2f 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -180,10 +180,10 @@ UnknownText_0x6113b:
 	line "to trade your"
 
 	para "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " for"
 	line "@"
-	text_from_ram wStringBuffer4
+	text_ram wStringBuffer4
 	text "."
 
 	para "We'll have to hold"
@@ -200,7 +200,7 @@ UnknownText_0x611c9:
 	line "to trade your"
 
 	para "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " for a"
 	line "#MON that you"
 	cont "have never seen."
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index c83709b03..c87b4f7fc 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -617,19 +617,19 @@ UnknownText_0x7c87b:
 	done
 
 HaircutBrosText_SlightlyHappier:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " looks a"
 	line "little happier."
 	done
 
 HaircutBrosText_Happier:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " looks"
 	line "happy."
 	done
 
 HaircutBrosText_MuchHappier:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " looks"
 	line "delighted!"
 	done
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 6443ac299..430d2dd79 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -199,11 +199,13 @@ LakeOfRageMagikarpHouseUnusedRecordText:
 	text "CURRENT RECORD"
 
 	para "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " caught by"
 	line "@"
-	text_from_ram wStringBuffer4
-	db "@@"
+	text_ram wStringBuffer4
+	text_end
+
+	text_end ; unused
 
 LakeOfRageMagikarpHouse_MapEvents:
 	db 0, 0 ; filler
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 33b2f0fb0..f07c4b295 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -912,7 +912,7 @@ Text_PleaseEnter:
 
 Text_RejectNewMon:
 	text "Sorry--@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text_start
 	line "can't be taken."
 	prompt
@@ -920,17 +920,17 @@ Text_RejectNewMon:
 Text_RejectMonWithNewMove:
 	text "You can't take the"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " with a"
 	cont "@"
-	text_from_ram wStringBuffer2
+	text_ram wStringBuffer2
 	text "."
 	prompt
 
 Text_RejectMonWithMail:
 	text "You can't take the"
 	line "@"
-	text_from_ram wStringBuffer1
+	text_ram wStringBuffer1
 	text " that"
 	cont "has MAIL with you."
 	prompt
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 8107ee022..2b7a979e5 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -237,7 +237,7 @@ UnknownText_0x5ceba:
 UnknownText_0x5cf3a:
 	text "This week's ID"
 	line "number is @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 	done
 
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 610263844..6a24bba32 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -224,7 +224,7 @@ MovementData_0x6a2e9:
 
 UnknownText_0x6a2eb:
 	text "Today's @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 	line "That means the"
 
@@ -287,7 +287,7 @@ UnknownText_0x6a4c6:
 
 	para "You'll have to use"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text ", the"
 
 	para "first #MON in"
@@ -371,7 +371,7 @@ UnknownText_0x6a71f:
 
 UnknownText_0x6a79a:
 	text "You still have @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	line "minute(s) left."
 
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 417dd346a..86c415813 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -475,7 +475,7 @@ MovementData_0x6add1:
 
 UnknownText_0x6add5:
 	text "Today's @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text "."
 	line "That means the"
 
@@ -538,7 +538,7 @@ UnknownText_0x6afb0:
 
 	para "You'll have to use"
 	line "@"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text ", the"
 
 	para "first #MON in"
@@ -622,7 +622,7 @@ UnknownText_0x6b209:
 
 UnknownText_0x6b284:
 	text "You still have @"
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text_start
 	line "minute(s) left."
 
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index b37be60a7..464dd65b2 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -119,7 +119,7 @@ TrainerHouseB1FIntroText:
 	done
 
 TrainerHouseB1FYourOpponentIsText:
-	text_from_ram wStringBuffer3
+	text_ram wStringBuffer3
 	text " is your"
 	line "opponent today."
 	done