summaryrefslogtreecommitdiff
path: root/data/text
diff options
context:
space:
mode:
Diffstat (limited to 'data/text')
-rw-r--r--data/text/battle.asm116
-rw-r--r--data/text/common_1.asm252
-rw-r--r--data/text/common_2.asm285
-rw-r--r--data/text/common_3.asm200
-rw-r--r--data/text/std_text.asm14
5 files changed, 472 insertions, 395 deletions
diff --git a/data/text/battle.asm b/data/text/battle.asm
index 9ac62c122..56a1cb8e1 100644
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -3,13 +3,13 @@ BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"
- deciram wPayDayMoney, 3, 6
+ text_decimal wPayDayMoney, 3, 6
text "!"
prompt
WildPokemonAppearedText:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText:
text "The hooked"
line "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
PokemonFellFromTreeText:
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
WildCelebiAppearedText:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
BattleText_EnemyFled:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
@@ -87,7 +87,7 @@ SandstormHitsText:
PerishCountText:
text "<USER>'s"
line "PERISH count is @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -95,7 +95,7 @@ BattleText_TargetRecoveredWithItem:
text "<TARGET>"
line "recovered with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -103,7 +103,7 @@ BattleText_UserRecoveredPPUsing:
text "<USER>"
line "recovered PP using"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -119,13 +119,13 @@ BattleText_SafeguardFaded:
prompt
BattleText_MonsLightScreenFell:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
BattleText_MonsReflectFaded:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
@@ -161,14 +161,14 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fainted!"
prompt
GotMoneyForWinningText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
prompt
@@ -185,7 +185,7 @@ TiedAgainstText:
SentSomeToMomText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
cont "Sent some to MOM!"
@@ -206,7 +206,7 @@ BattleText_0x80a4f:
prompt
BattleText_MonFainted:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "fainted!"
prompt
@@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "."
para "Will <PLAYER>"
@@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
done
@@ -273,7 +273,7 @@ BattleText_UserFledUsingAStringBuffer1:
text "<USER>"
line "fled using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -290,14 +290,14 @@ RecoveredUsingText:
text "<TARGET>"
line "recovered using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
BattleText_UsersStringBuffer1Activated:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "activated!"
prompt
@@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt
BattleText_MonIsAlreadyOut:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "is already out."
prompt
BattleText_MonCantBeRecalled:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
@@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt
BattleText_MonHasNoMovesLeft:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "has no moves left!"
done
@@ -341,24 +341,26 @@ BattleText_TargetsEncoreEnded:
prompt
BattleText_StringBuffer1GrewToLevel:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
- db "@@"
+ text_end
+
+ text_end ; unused
BattleText_WildMonIsEating:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is eating!"
prompt
BattleText_WildMonIsAngry:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@@ -416,7 +418,7 @@ BecameConfusedText:
BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " rid"
line "<TARGET>"
cont "of its confusion."
@@ -431,7 +433,7 @@ BattleText_UsersHurtByStringBuffer1:
text "<USER>'s"
line "hurt by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -439,7 +441,7 @@ BattleText_UserWasReleasedFromStringBuffer1:
text "<USER>"
line "was released from"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -485,7 +487,7 @@ HungOnText:
text "<TARGET>"
line "hung on with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -509,43 +511,43 @@ InfatuationText:
DisabledMoveText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " is"
cont "DISABLED!"
prompt
LoafingAroundText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " is"
line "loafing around."
prompt
BeganToNapText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " began"
line "to nap!"
prompt
WontObeyText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " won't"
line "obey!"
prompt
TurnedAwayText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " turned"
line "away!"
prompt
IgnoredOrdersText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
IgnoredSleepingText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
@@ -559,7 +561,7 @@ HasNoPPLeftText:
text "<USER>"
line "has no PP left for"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!"
prompt
@@ -653,7 +655,7 @@ SketchedText:
text "<USER>"
line "SKETCHED"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -666,10 +668,10 @@ DestinyBondEffectText:
SpiteEffectText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "reduced by @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -731,7 +733,7 @@ WasFrozenText:
WontRiseAnymoreText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "rise anymore!"
prompt
@@ -739,7 +741,7 @@ WontRiseAnymoreText:
WontDropAnymoreText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "drop anymore!"
prompt
@@ -761,13 +763,13 @@ BlownAwayText:
PlayerHitTimesText:
text "Hit @"
- deciram wPlayerDamageTaken, 1, 1
+ text_decimal wPlayerDamageTaken, 1, 1
text " times!"
prompt
EnemyHitTimesText:
text "Hit @"
- deciram wEnemyDamageTaken, 1, 1
+ text_decimal wEnemyDamageTaken, 1, 1
text " times!"
prompt
@@ -782,7 +784,7 @@ ProtectedByMistText:
prompt
GettingPumpedText:
- interpret_data
+ text_pause
text "<USER>'s"
line "getting pumped!"
prompt
@@ -822,7 +824,7 @@ LearnedMoveText:
text "<USER>"
line "learned"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -839,7 +841,7 @@ EvadedText:
WasDisabledText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "DISABLED!"
prompt
@@ -853,7 +855,7 @@ TransformedTypeText:
text "<USER>"
line "transformed into"
cont "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "-type!"
prompt
@@ -866,7 +868,7 @@ TransformedText:
text "<USER>"
line "TRANSFORMED into"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -933,7 +935,7 @@ ProtectedByText:
text "<TARGET>'s"
line "protected by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -945,7 +947,7 @@ MirrorMoveFailedText:
StoleText:
text "<USER>"
line "stole @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "from its foe!"
prompt
@@ -1029,7 +1031,7 @@ SafeguardProtectText:
MagnitudeText:
text "Magnitude @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -1079,7 +1081,7 @@ ForesawAttackText:
prompt
BeatUpAttackText:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "attack!"
done
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index cf6e3ce8c..617de0f49 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
_HeyItsFruitText::
text "Hey! It's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
_ObtainedFruitText::
text "Obtained"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -38,67 +38,69 @@ UnknownText_0x1bc089::
done
UnknownText_0x1bc0a2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "recovered @"
- deciram wCurHPAnimDeltaHP, 2, 3
+ text_decimal wCurHPAnimDeltaHP, 2, 3
text "HP!"
done
UnknownText_0x1bc0bb::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "cured of poison."
done
UnknownText_0x1bc0d2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "rid of paralysis."
done
UnknownText_0x1bc0ea::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "burn was healed."
done
UnknownText_0x1bc101::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was defrosted."
done
UnknownText_0x1bc115::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "woke up."
done
UnknownText_0x1bc123::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "health returned."
done
UnknownText_0x1bc13a::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "is revitalized."
done
UnknownText_0x1bc14f::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc16e::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "to its senses."
done
@@ -148,7 +150,8 @@ UnknownText_0x1bc272::
done
UnknownText_0x1bc288::
- text "CARD FOLDER open.@@"
+ text "CARD FOLDER open.@"
+ text_end
UnknownText_0x1bc29c::
text "<……><……><……><……><……><……>"
@@ -166,7 +169,8 @@ UnknownText_0x1bc2eb::
done
UnknownText_0x1bc2fd::
- text "What?@@"
+ text "What?@"
+ text_end
UnknownText_0x1bc305::
text "?"
@@ -177,7 +181,8 @@ UnknownText_0x1bc308::
done
UnknownText_0x1bc31b::
- text "Whoa!@@"
+ text "Whoa!@"
+ text_end
UnknownText_0x1bc323::
text "?"
@@ -276,7 +281,7 @@ UnknownText_0x1bc4b2::
UnknownText_0x1bc4d7::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
@@ -288,19 +293,19 @@ UnknownText_0x1bc4ec::
UnknownText_0x1bc509::
text "Set up the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1bc51c::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
para "and set up the"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
prompt
@@ -331,7 +336,7 @@ UnknownText_0x1bc5b3::
UnknownText_0x1bc5d7::
text "It's an adorable"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -372,10 +377,10 @@ UnknownText_0x1bc6c7::
done
UnknownText_0x1bc6e9::
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " was"
line "sent to @"
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text "."
done
@@ -384,104 +389,108 @@ UnknownText_0x1bc701::
done
UnknownText_0x1bc703::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " bids"
line "farewell to"
done
UnknownText_0x1bc719::
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc71f::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc739::
text "For @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text ","
done
UnknownText_0x1bc74c::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " sends"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc75e::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " will"
line "trade @"
- text_from_ram wOTTrademonSpeciesName
- db "@@"
+ text_ram wOTTrademonSpeciesName
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc774::
text "for @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text "."
done
UnknownText_0x1bc787::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text " will"
line "trade @"
- text_from_ram wPlayerTrademonSpeciesName
- db "@@"
+ text_ram wPlayerTrademonSpeciesName
+ text_end
+
+ text_end ; unused
UnknownText_0x1bc79d::
text "for @"
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text "'s"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc7b0::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " trade…"
done
UnknownText_0x1bc7c3::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc7dd::
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " trade…"
done
UnknownText_0x1bc7f0::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc80a::
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text " came"
line "back!"
done
@@ -506,8 +515,10 @@ _OPT_IntroText3::
_OPT_OakText1::
text_start
line "OAK: @"
- text_from_ram wMonOrItemNameBuffer
- db "@@"
+ text_ram wMonOrItemNameBuffer
+ text_end
+
+ text_end ; unused
_OPT_OakText2::
text_start
@@ -517,14 +528,14 @@ _OPT_OakText2::
_OPT_OakText3::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
_OPT_MaryText1::
text_start
line "MARY: @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
done
@@ -695,8 +706,10 @@ _OPT_PokemonChannelText::
_PokedexShowText::
text_start
line "@"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
; Pokémon Music Channel / Pokémusic
@@ -728,7 +741,7 @@ _FernIntroText2::
_BenFernText1::
text_start
line "Today's @"
- current_day
+ text_today
text ","
done
@@ -792,8 +805,8 @@ _LC_Text7::
_LC_Text8::
text_start
line "Number is @"
- interpret_data
- text_from_ram wStringBuffer1
+ text_pause
+ text_ram wStringBuffer1
text "!"
done
@@ -842,10 +855,12 @@ _PnP_Text3::
_PnP_Text4::
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " @"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
_PnP_cute::
text_start
@@ -930,8 +945,10 @@ _PnP_odd::
_PnP_Text5::
text_start
line "@"
- text_from_ram wStringBuffer1
- db "@@"
+ text_ram wStringBuffer1
+ text_end
+
+ text_end ; unused
_RocketRadioText1::
text_start
@@ -966,28 +983,28 @@ _RocketRadioText6::
_RocketRadioText7::
text_start
line "GIOVANNI! @"
- interpret_data
+ text_pause
text "Can you"
done
_RocketRadioText8::
text_start
line "hear?@"
- interpret_data
+ text_pause
text " We did it!"
done
_RocketRadioText9::
text_start
line "@"
- interpret_data
+ text_pause
text "Where is our boss?"
done
_RocketRadioText10::
text_start
line "@"
- interpret_data
+ text_pause
text "Is he listening?"
done
@@ -1009,7 +1026,7 @@ _BuenaRadioText3::
_BuenaRadioText4::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
done
@@ -1085,17 +1102,17 @@ Text_EnemyWithdrew::
text "<ENEMY>"
line "withdrew"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
Text_EnemyUsedOn::
text "<ENEMY>"
line "used @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
cont "on @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
@@ -1111,7 +1128,7 @@ Text_ThatItemCantBePutInThePack::
Text_TheItemWasPutInThePack::
text "The @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was put in the"
cont "PACK."
@@ -1138,7 +1155,7 @@ UnknownText_0x1bd05e::
UnknownText_0x1bd07f::
text "Will you play with"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1155,7 +1172,7 @@ Text_BreedingIsNotPossible::
UnknownText_0x1bd0d8::
text "The compatibility"
line "is @"
- deciram wBreedingCompatibility, 1, 3
+ text_decimal wBreedingCompatibility, 1, 3
text "."
cont "Should they breed?"
done
@@ -1173,7 +1190,7 @@ UnknownText_0x1bd11c::
UnknownText_0x1bd131::
text "Test event"
line "@"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text "?"
done
@@ -1205,7 +1222,7 @@ UnknownText_0x1bd188::
UnknownText_0x1bd19a::
text "A new CARD arrived"
line "from @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
@@ -1215,10 +1232,10 @@ UnknownText_0x1bd1ba::
done
UnknownText_0x1bd1dd::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s CARD was"
line "listed as no.@"
- deciram wStringBuffer1, 1, 2
+ text_decimal wStringBuffer1, 1, 2
text "."
prompt
@@ -1251,10 +1268,10 @@ UnknownText_0x1bd266::
UnknownText_0x1bd286::
text "Trading @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "…"
done
@@ -1286,7 +1303,7 @@ UnknownText_0x1bd308::
UnknownText_0x1bd321::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -1298,10 +1315,10 @@ UnknownText_0x1bd331::
UnknownText_0x1bd34b::
text "I just saw some"
line "rare @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "I'll call you if I"
@@ -1315,14 +1332,16 @@ UnknownText_0x1bd39e::
done
UnknownText_0x1bd3be::
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@"
sound_item
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1bd3d7::
text "You have no coins."
@@ -1341,27 +1360,30 @@ UnknownText_0x1bd407::
UnknownText_0x1bd429::
text "<PLAYER> traded"
line "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " for"
cont "@"
- text_from_ram wStringBuffer2
- text ".@@"
+ text_ram wStringBuffer2
+ text ".@"
+ text_end
UnknownText_0x1bd445::
sound_dex_fanfare_80_109
- interpret_data
- db "@@"
+ text_pause
+ text_end
+
+ text_end ; unused
UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1373,7 +1395,7 @@ UnknownText_0x1bd48c::
UnknownText_0x1bd4aa::
text "Huh? That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ". "
cont "What a letdown…"
done
@@ -1381,7 +1403,7 @@ UnknownText_0x1bd4aa::
UnknownText_0x1bd4d2::
text "Yay! I got myself"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
cont "Thanks!"
done
@@ -1389,7 +1411,7 @@ UnknownText_0x1bd4d2::
UnknownText_0x1bd4f4::
text "Hi, how's my old"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " doing?"
done
@@ -1399,12 +1421,12 @@ UnknownText_0x1bd512::
para "If you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ", would"
para "you trade it for"
line "my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1419,7 +1441,7 @@ UnknownText_0x1bd565::
UnknownText_0x1bd5a1::
text "You don't have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "? That's"
cont "too bad, then."
done
@@ -1429,31 +1451,31 @@ UnknownText_0x1bd5cc::
para "I finally got"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
UnknownText_0x1bd5f4::
text "Hi! The @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "you traded me is"
cont "doing great!"
done
UnknownText_0x1bd621::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s cute,"
line "but I don't have"
para "it. Do you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1465,7 +1487,7 @@ UnknownText_0x1bd673::
UnknownText_0x1bd696::
text "That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "Please trade with"
@@ -1476,19 +1498,19 @@ UnknownText_0x1bd6cd::
text "Wow! Thank you!"
line "I always wanted"
cont "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "!"
done
UnknownText_0x1bd6f5::
text "How is that"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " I"
cont "traded you doing?"
para "Your @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "so cute!"
done
@@ -1709,7 +1731,7 @@ UnknownText_0x1bdcff::
UnknownText_0x1bdd30::
text "OK. I'll raise"
line "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1722,25 +1744,25 @@ UnknownText_0x1bdd64::
text "Are we geniuses or"
line "what? Want to see"
cont "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1bdd96::
text "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "has grown a lot."
para "By level, it's"
line "grown by @"
- deciram wStringBuffer2 + 1, 1, 3
+ text_decimal wStringBuffer2 + 1, 1, 3
text "."
para "If you want your"
line "#MON back, it"
cont "will cost ¥@"
- deciram wStringBuffer2 + 2, 3, 4
+ text_decimal wStringBuffer2 + 2, 3, 4
text "."
done
@@ -1752,14 +1774,14 @@ UnknownText_0x1bde04::
UnknownText_0x1bde1f::
text "<PLAYER> got back"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1bde32::
text "Huh? Back already?"
line "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
para "needs a little"
line "more time with us."
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 679c207d8..6e2d21800 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -27,7 +27,7 @@ UnknownText_0x1c00a0::
UnknownText_0x1c00cd::
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "…"
line "That's a fairly"
cont "decent name."
@@ -60,13 +60,13 @@ UnknownText_0x1c019e::
UnknownText_0x1c01be::
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
line "What a great name!"
cont "It's perfect."
para "Treat @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "with loving care."
done
@@ -90,63 +90,72 @@ UnknownText_0x1c0272::
text "All right. This"
line "#MON is now"
cont "named @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
Text_Gained::
- text_from_ram wStringBuffer1
- text " gained@@"
+ text_ram wStringBuffer1
+ text " gained@"
+ text_end
Text_ABoostedStringBuffer2ExpPoints::
text_start
line "a boosted"
cont "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_StringBuffer2ExpPoints::
text_start
line "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_GoMon::
- text "Go! @@"
+ text "Go! @"
+ text_end
Text_DoItMon::
- text "Do it! @@"
+ text "Do it! @"
+ text_end
Text_GoForItMon::
text "Go for it,"
- line "@@"
+ line "@"
+ text_end
Text_YourFoesWeakGetmMon::
text "Your foe's weak!"
- line "Get'm, @@"
+ line "Get'm, @"
+ text_end
Text_BattleMonNick01::
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_BattleMonNickComma::
- text_from_ram wBattleMonNick
- text ",@@"
+ text_ram wBattleMonNick
+ text ",@"
+ text_end
Text_ThatsEnoughComeBack::
text " that's"
- line "enough! Come back!@@"
+ line "enough! Come back!@"
+ text_end
Text_OKComeBack::
text " OK!"
- line "Come back!@@"
+ line "Come back!@"
+ text_end
Text_GoodComeBack::
text " good!"
- line "Come back!@@"
+ line "Come back!@"
+ text_end
Text_ComeBack::
text " come"
@@ -164,26 +173,26 @@ UnknownText_0x1c0384::
UnknownText_0x1c0396::
text "It contained"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "Teach @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "to a #MON?"
done
UnknownText_0x1c03c2::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " is"
line "not compatible"
cont "with @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "It can't learn"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -191,14 +200,14 @@ UnknownText_0x1c03fa::
text "You have no room"
line "for any more"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "S."
prompt
UnknownText_0x1c0421::
text "You received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -233,36 +242,36 @@ UnknownText_0x1c04c6::
prompt
UnknownText_0x1c04e9::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c04fa::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "to @"
- text_from_ram wMysteryGiftPlayerName
+ text_ram wMysteryGiftPlayerName
text "'s home."
prompt
UnknownText_0x1c051a::
text "Received"
line "@"
- text_from_ram wc850
+ text_ram wc850
text "'s CARD."
prompt
UnknownText_0x1c0531::
- text_from_ram wc850
+ text_ram wc850
text "'s CARD was"
line "listed as no.@"
- deciram wDeciramBuffer, 1, 2
+ text_decimal wDeciramBuffer, 1, 2
text "."
prompt
@@ -292,7 +301,7 @@ UnknownText_0x1c05c8::
prompt
UnknownText_0x1c05dd::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "CUT!"
prompt
@@ -306,10 +315,12 @@ UnknownText_0x1c0609::
text "A blinding FLASH"
line "lights the area!@"
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
_UsedSurfText::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "SURF!"
done
@@ -330,7 +341,7 @@ _AskSurfText::
done
UnknownText_0x1c068e::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WATERFALL!"
done
@@ -346,7 +357,7 @@ UnknownText_0x1c06bf::
done
UnknownText_0x1c06de::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "DIG!"
done
@@ -379,13 +390,13 @@ UnknownText_0x1c0751::
prompt
UnknownText_0x1c0774::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "STRENGTH!"
done
UnknownText_0x1c0788::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " can"
line "move boulders."
prompt
@@ -409,7 +420,7 @@ UnknownText_0x1c07f4::
done
UnknownText_0x1c0816::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WHIRLPOOL!"
prompt
@@ -431,7 +442,7 @@ UnknownText_0x1c0864::
done
UnknownText_0x1c0897::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " did a"
line "HEADBUTT!"
prompt
@@ -449,7 +460,7 @@ UnknownText_0x1c08bc::
done
UnknownText_0x1c08f0::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "ROCK SMASH!"
prompt
@@ -489,14 +500,14 @@ UnknownText_0x1c099a::
UnknownText_0x1c09b2::
text "<PLAYER> got on the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
UnknownText_0x1c09c7::
text "<PLAYER> got off"
line "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
@@ -515,7 +526,7 @@ UnknownText_0x1c0a05::
UnknownText_0x1c0a1c::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -545,7 +556,7 @@ UnknownText_0x1c0aa9::
prompt
UnknownText_0x1c0acc::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "fainted!"
prompt
@@ -559,7 +570,7 @@ UnknownText_0x1c0ada::
prompt
UnknownText_0x1c0b03::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " used"
line "SWEET SCENT!"
done
@@ -598,17 +609,17 @@ UnknownText_0x1c0ba5::
UnknownText_0x1c0bbb::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c0bd8::
text "Threw away"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -626,7 +637,7 @@ Text_YouDontHaveAMon::
UnknownText_0x1c0c2e::
text "Registered the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -657,11 +668,13 @@ Text_AreYouABoyOrAreYouAGirl::
UnknownText_0x1c0cc6::
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0cd0::
- interpret_data
+ text_pause
text "<SCROLL>went way up!"
prompt
@@ -672,11 +685,13 @@ UnknownText_0x1c0ce0::
UnknownText_0x1c0ceb::
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0cf5::
- interpret_data
+ text_pause
text "<SCROLL>sharply fell!"
prompt
@@ -685,7 +700,8 @@ UnknownText_0x1c0d06::
prompt
UnknownText_0x1c0d0e::
- text "<USER>@@"
+ text "<USER>@"
+ text_end
UnknownText_0x1c0d12::
text_start
@@ -718,23 +734,29 @@ UnknownText_0x1c0d6c::
prompt
_ActorNameText::
- text "<USER>@@"
+ text "<USER>@"
+ text_end
_UsedMove1Text::
text_start
- line "used @@"
+ line "used @"
+ text_end
_UsedMove2Text::
text_start
- line "used @@"
+ line "used @"
+ text_end
_UsedInsteadText::
text "instead,"
- cont "@@"
+ cont "@"
+ text_end
_MoveNameText::
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
_EndUsedMove1Text::
text "!"
@@ -759,30 +781,33 @@ _EndUsedMove5Text::
UnknownText_0x1c0db0::
text "Huh?"
- para "@@"
+ para "@"
+ text_end
UnknownText_0x1c0db8::
text_start
done
UnknownText_0x1c0dba::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "out of its EGG!@"
sound_caught_mon
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0dd8::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1c0df3::
text "It's @"
- text_from_ram wBreedMon2Nick
+ text_ram wBreedMon2Nick
text_start
line "that was left with"
cont "the DAY-CARE LADY."
@@ -790,7 +815,7 @@ UnknownText_0x1c0df3::
UnknownText_0x1c0e24::
text "It's @"
- text_from_ram wBreedMon1
+ text_ram wBreedMon1
text_start
line "that was left with"
cont "the DAY-CARE MAN."
@@ -804,28 +829,28 @@ UnknownText_0x1c0e54::
UnknownText_0x1c0e6f::
text "It has no interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0e8d::
text "It appears to care"
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0eac::
text "It's friendly with"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0ec6::
text "It shows interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -872,20 +897,22 @@ UnknownText_0x1c0fb8::
prompt
UnknownText_0x1c0fbc::
- deciram wcf64, 1, 3
+ text_decimal wcf64, 1, 3
text " @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "Animation type @"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c0fdd::
text "#MON number?"
done
Text_WasSentToBillsPC::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
line "sent to BILL's PC."
prompt
@@ -924,7 +951,7 @@ UnknownText_0x1c10a2::
UnknownText_0x1c10c0::
text "Caught @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -935,70 +962,73 @@ UnknownText_0x1c10cf::
UnknownText_0x1c10dd::
text "You already caught"
line "a @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
ContestJudging_FirstPlaceText::
text "This Bug-Catching"
line "Contest winner is@"
- interpret_data
+ text_pause
text "…"
para "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
line "who caught a"
cont "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_FirstPlaceScoreText::
text_start
para "The winning score"
line "was @"
- deciram wBugContestFirstPlaceScore, 2, 3
+ text_decimal wBugContestFirstPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_SecondPlaceText::
text "Placing second was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_SecondPlaceScoreText::
text_start
para "The score was"
line "@"
- deciram wBugContestSecondPlaceScore, 2, 3
+ text_decimal wBugContestSecondPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_ThirdPlaceText::
text "Placing third was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
- text "!@@"
+ text_ram wStringBuffer1
+ text "!@"
+ text_end
ContestJudging_ThirdPlaceScoreText::
text_start
para "The score was"
line "@"
- deciram wBugContestThirdPlaceScore, 2, 3
+ text_decimal wBugContestThirdPlaceScore, 2, 3
text " points!"
prompt
@@ -1008,7 +1038,7 @@ UnknownText_0x1c1203::
para "…Hm, it measures"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1016,12 +1046,14 @@ UnknownText_0x1c123a::
text "CURRENT RECORD"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " caught by"
line "@"
- text_from_ram wMagikarpRecordHoldersName
+ text_ram wMagikarpRecordHoldersName
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c1261::
text "Congratulations!"
@@ -1030,7 +1062,7 @@ UnknownText_0x1c1261::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your party."
prompt
@@ -1042,7 +1074,7 @@ UnknownText_0x1c12ae::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your PC BOX."
prompt
@@ -1050,7 +1082,7 @@ UnknownText_0x1c12ae::
UnknownText_0x1c12fc::
text "Give a nickname to"
line "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " you"
cont "received?"
done
@@ -1078,10 +1110,10 @@ _PlayersPCHowManyWithdrawText::
_PlayersPCWithdrewItemsText::
text "Withdrew @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -1101,10 +1133,10 @@ _PlayersPCHowManyDepositText::
_PlayersPCDepositItemsText::
text "Deposited @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -1161,10 +1193,10 @@ _OakPCText2::
prompt
_OakPCText3::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " #MON seen"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " #MON owned"
para "PROF.OAK's"
@@ -1352,23 +1384,23 @@ UnknownText_0x1c1a6c::
UnknownText_0x1c1a90::
text "Toss out how many"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aad::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aca::
text "Discarded"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "(S)."
prompt
@@ -1385,24 +1417,24 @@ UnknownText_0x1c1b03::
UnknownText_0x1c1b2c::
text "Took @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " and"
para "made it hold"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c1b57::
text "Made @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "hold @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1412,7 +1444,7 @@ UnknownText_0x1c1b6f::
prompt
UnknownText_0x1c1b8e::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " isn't"
line "holding anything."
prompt
@@ -1424,20 +1456,20 @@ UnknownText_0x1c1baa::
UnknownText_0x1c1bc4::
text "Took @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "from @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "."
prompt
UnknownText_0x1c1bdc::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "already holding"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
line "Switch items?"
done
@@ -1455,7 +1487,7 @@ UnknownText_0x1c1c22::
UnknownText_0x1c1c47::
text "MAIL detached from"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1508,11 +1540,14 @@ _OakText2::
text "This world is in-"
line "habited by crea-"
cont "tures that we call"
- cont "#MON.@@"
+ cont "#MON.@"
+ text_end
_OakText3::
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
_OakText4::
text "People and #MON"
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 4ed12258b..53fa047c4 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -65,17 +65,17 @@ UnknownText_0x1c41b1::
UnknownText_0x1c41e6::
text "Your friend's"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " appears"
cont "to be abnormal!"
prompt
UnknownText_0x1c4212::
text "Trade @"
- text_from_ram wd004
+ text_ram wd004
text_start
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
@@ -124,7 +124,7 @@ UnknownText_0x1c4298::
UnknownText_0x1c439c::
text "Today's remaining"
line "time is @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text " min."
para "Would you like to"
@@ -133,7 +133,7 @@ UnknownText_0x1c439c::
UnknownText_0x1c43dc::
text "There are only @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text_start
line "min. left today."
@@ -180,7 +180,7 @@ UnknownText_0x1c4508::
UnknownText_0x1c4525::
text "Today's remaining"
line "time is @"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text " min."
done
@@ -257,23 +257,23 @@ UnknownText_0x1c4706::
UnknownText_0x1c4719::
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
UnknownText_0x1c472c::
text "<PLAYER> put the"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "the @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1c474b::
text "The @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "is full…"
prompt
@@ -297,21 +297,21 @@ UnknownText_0x1c4797::
UnknownText_0x1c47d4::
text "Hm… I see you met"
line "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " here:"
cont "@"
- text_from_ram wSeerCaughtLocation
+ text_ram wSeerCaughtLocation
text "!"
prompt
UnknownText_0x1c47fa::
text "The time was"
line "@"
- text_from_ram wSeerTimeOfDay
+ text_ram wSeerTimeOfDay
text "!"
para "Its level was @"
- text_from_ram wSeerCaughtLevelString
+ text_ram wSeerCaughtLevelString
text "!"
para "Am I good or what?"
@@ -319,21 +319,21 @@ UnknownText_0x1c47fa::
UnknownText_0x1c4837::
text "Hm… @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
line "came from @"
- text_from_ram wSeerOTName
+ text_ram wSeerOTName
text_start
cont "in a trade?"
para "@"
- text_from_ram wSeerCaughtLocation
+ text_ram wSeerCaughtLocation
text_start
line "was where @"
- text_from_ram wSeerOTName
+ text_ram wSeerOTName
text_start
cont "met @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text "!"
prompt
@@ -349,7 +349,7 @@ UnknownText_0x1c487f::
para "I can't tell where"
line "you met it, but it"
cont "was at level @"
- text_from_ram wSeerCaughtLevelString
+ text_ram wSeerCaughtLevelString
text "."
para "Am I good or what?"
@@ -386,7 +386,7 @@ UnknownText_0x1c49c6::
line "grown a little."
para "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " seems"
line "to be becoming"
cont "more confident."
@@ -396,7 +396,7 @@ UnknownText_0x1c4a21::
text "Incidentally…"
para "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text " has"
line "grown. It's gained"
cont "much strength."
@@ -409,7 +409,7 @@ UnknownText_0x1c4a5b::
line "grown mighty!"
para "This @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
line "must have come"
@@ -432,12 +432,12 @@ UnknownText_0x1c4ae5::
para "seen a #MON as"
line "mighty as this"
cont "@"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text "."
para "I'm sure that"
line "seeing @"
- text_from_ram wSeerNickname
+ text_ram wSeerNickname
text_start
para "in battle would"
@@ -447,28 +447,30 @@ UnknownText_0x1c4ae5::
UnknownText_0x1c4b92::
text "Congratulations!"
line "Your @"
- text_from_ram wStringBuffer2
- db "@@"
+ text_ram wStringBuffer2
+ text_end
+
+ text_end ; unused
UnknownText_0x1c4baf::
text_start
para "evolved into"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
done
UnknownText_0x1c4bc5::
text "Huh? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "stopped evolving!"
prompt
UnknownText_0x1c4be3::
text "What? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "is evolving!"
done
@@ -478,12 +480,12 @@ UnknownText_0x1c4bfd::
done
UnknownText_0x1c4c08::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -507,12 +509,12 @@ UnknownText_0x1c4ca3::
done
UnknownText_0x1c4cae::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -548,10 +550,10 @@ UnknownText_0x1c4d47::
done
UnknownText_0x1c4db0::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " costs"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text ". Want it?"
done
@@ -590,12 +592,12 @@ UnknownText_0x1c4e7e::
done
UnknownText_0x1c4e89::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will cost ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -630,7 +632,7 @@ UnknownText_0x1c4f33::
UnknownText_0x1c4f3e::
text "I can pay you"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
para "Is that OK?"
@@ -672,10 +674,10 @@ UnknownText_0x1c500d::
UnknownText_0x1c502e::
text "Got ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text " for"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
done
@@ -705,7 +707,7 @@ UnknownText_0x1c5092::
UnknownText_0x1c509f::
text "lined up!"
line "Won @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " coins!"
done
@@ -757,13 +759,13 @@ UnknownText_0x1c51d7::
prompt
UnknownText_0x1c51f4::
- text_from_ram wMobileParticipant1Nickname
+ text_ram wMobileParticipant1Nickname
text ","
line "@"
- text_from_ram wMobileParticipant2Nickname
+ text_ram wMobileParticipant2Nickname
text " and"
cont "@"
- text_from_ram wMobileParticipant3Nickname
+ text_ram wMobileParticipant3Nickname
text "."
para "Use these three?"
@@ -932,14 +934,16 @@ UnknownText_0x1c564a::
done
UnknownText_0x1c5660::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " learned"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5678::
text "Which move should"
@@ -949,29 +953,29 @@ UnknownText_0x1c5678::
UnknownText_0x1c5699::
text "Stop learning"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
UnknownText_0x1c56af::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "did not learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c56c9::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "trying to learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "But @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "can't learn more"
cont "than four moves."
@@ -979,25 +983,27 @@ UnknownText_0x1c56c9::
para "Delete an older"
line "move to make room"
cont "for @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
UnknownText_0x1c5740::
text "1, 2 and…@"
- interpret_data
- db "@@"
+ text_pause
+ text_end
+
+ text_end ; unused
UnknownText_0x1c574e::
text " Poof!@"
- interpret_data
+ text_pause
text_start
para "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " forgot"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "And…"
@@ -1044,8 +1050,10 @@ UnknownText_0x1c581a::
done
UnknownText_0x1c5821::
- current_day
- db "@@"
+ text_today
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5824::
text "<……>"
@@ -1077,7 +1085,7 @@ UnknownText_0x1c589f::
done
UnknownText_0x1c58bc::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
line "Is that right?"
done
@@ -1148,7 +1156,7 @@ Text_OnlyThreeMonMayBeEntered::
Text_TheMonMustAllBeDifferentKinds::
text "The @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " #MON"
line "must all be"
cont "different kinds."
@@ -1158,7 +1166,7 @@ Text_TheMonMustAllBeDifferentKinds::
Text_TheMonMustNotHoldTheSameItems::
text "The @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " #MON"
line "must not hold the"
cont "same items."
@@ -1208,43 +1216,49 @@ UnknownText_0x1c5afa::
UnknownText_0x1c5b17::
text "Gotcha! @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "was caught!@"
sound_caught_mon
- db "@@"
+ text_end
+
+ text_end ; unused
Text_Waitbutton_2::
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5b38::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " was"
line "sent to BILL's PC."
prompt
UnknownText_0x1c5b53::
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "'s data"
line "was newly added to"
cont "the #DEX.@"
sound_slot_machine_start
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5b7f::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1c5b9a::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " rose."
prompt
@@ -1276,20 +1290,24 @@ UnknownText_0x1c5c44::
text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
- db "@@"
+ text_end
+
+ text_end ; unused
UnknownText_0x1c5c5e::
text "You now have"
line "@"
- deciram wBlueCardBalance, 1, 2
+ text_decimal wBlueCardBalance, 1, 2
text " points."
done
UnknownText_0x1c5c7b::
text "Coins:"
line "@"
- deciram wCoins, 2, 4
- db "@@"
+ text_decimal wCoins, 2, 4
+ text_end
+
+ text_end ; unused
Text_RaiseThePPOfWhichMove::
text "Raise the PP of"
@@ -1302,13 +1320,13 @@ Text_RestoreThePPOfWhichMove::
done
Text_PPIsMaxedOut::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "is maxed out."
prompt
Text_PPsIncreased::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "increased."
prompt
@@ -1324,7 +1342,7 @@ UnknownText_0x1c5d03::
text_start
para "@"
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " sent the"
line "trophy home."
prompt
@@ -1371,7 +1389,7 @@ UnknownText_0x1c5e01::
UnknownText_0x1c5e1d::
text "Can't get on your"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " now."
prompt
@@ -1384,14 +1402,14 @@ UnknownText_0x1c5e3a::
UnknownText_0x1c5e68::
text "<PLAYER> used the@"
text_low
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
UnknownText_0x1c5e7b::
text "<PLAYER> got on the@"
text_low
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1399,15 +1417,15 @@ UnknownText_0x1c5e90::
text "<PLAYER> got off@"
text_low
text "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c5ea8::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " knows"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1419,7 +1437,7 @@ UnknownText_0x1c5eba::
UnknownText_0x1c5eda::
text "Oh, make it forget"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
diff --git a/data/text/std_text.asm b/data/text/std_text.asm
index 238f0ac5d..18edf239b 100644
--- a/data/text/std_text.asm
+++ b/data/text/std_text.asm
@@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
ContestResults_PlayerWonAPrizeText:
text "<PLAYER>, the No.@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "finisher, wins"
cont "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "!"
done
ReceivedItemText:
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
@@ -279,14 +279,14 @@ ContestResults_PartyFullText:
done
GymStatue_CityGymText:
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "#MON GYM"
done
GymStatue_WinningTrainersText:
text "LEADER: @"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text_start
para "WINNING TRAINERS:"
line "<PLAYER>"
@@ -376,13 +376,13 @@ HappinessText1:
RegisteredNumber1Text:
text "<PLAYER> registered"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s number."
done
RegisteredNumber2Text:
text "<PLAYER> registered"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "'s number."
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-10 18:58:39 +0000