summaryrefslogtreecommitdiff
path: root/text.asm
diff options
context:
space:
mode:
Diffstat (limited to 'text.asm')
-rw-r--r--text.asm309
1 files changed, 155 insertions, 154 deletions
diff --git a/text.asm b/text.asm
index 6e31fb03..866d4a7f 100644
--- a/text.asm
+++ b/text.asm
@@ -1,4 +1,5 @@
-
+INCLUDE "charmap.asm"
+INCLUDE "constants/text_constants.asm"
TEXT_1 EQU $20
TEXT_2 EQU TEXT_1 + 1
TEXT_3 EQU TEXT_2 + 1
@@ -15,7 +16,6 @@ POKEDEX_TEXT EQU TEXT_11 + 1
MOVE_NAMES EQU POKEDEX_TEXT + 1
INCLUDE "macros.asm"
-INCLUDE "charmap.asm"
INCLUDE "hram.asm"
@@ -25,7 +25,7 @@ _CardKeySuccessText1::
text "Bingo!@@"
_CardKeySuccessText2::
- db $0
+ text ""
line "The CARD KEY"
cont "opened the door!"
done
@@ -79,7 +79,7 @@ _PokeCenterSignText::
done
_FoundItemText::
- text $52, " found"
+ text "<PLAYER> found"
line "@"
TX_RAM wcf4b
text "!@@"
@@ -96,7 +96,7 @@ _OaksAideHiText::
para "If you caught @"
TX_NUM hOaksAideRequirement, 1, 3
- db $0
+ text ""
line "kinds of #MON,"
cont "I'm supposed to"
cont "give you an"
@@ -104,7 +104,7 @@ _OaksAideHiText::
TX_RAM wOaksAideRewardItemName
text "!"
- para "So, ", $52, "! Have"
+ para "So, <PLAYER>! Have"
line "you caught at"
cont "least @"
TX_NUM hOaksAideRequirement, 1, 3
@@ -117,7 +117,7 @@ _OaksAideUhOhText::
line "Uh-oh! You have"
cont "caught only @"
TX_NUM hOaksAideNumMonsOwned, 1, 3
- db $0
+ text ""
cont "kinds of #MON!"
para "You need @"
@@ -134,7 +134,7 @@ _OaksAideComeBackText::
para "When you get @"
TX_NUM hOaksAideRequirement, 1, 3
- db $0
+ text ""
line "kinds, come back"
cont "for @"
TX_RAM wOaksAideRewardItemName
@@ -153,7 +153,7 @@ _OaksAideHereYouGoText::
prompt
_OaksAideGotItemText::
- text $52, " got the"
+ text "<PLAYER> got the"
line "@"
TX_RAM wOaksAideRewardItemName
text "!@@"
@@ -239,10 +239,10 @@ _AIBattleWithdrawText::
_AIBattleUseItemText::
TX_RAM wTrainerName
- db $0
+ text ""
line "used @"
TX_RAM wcd6d
- db $0
+ text ""
cont "on @"
TX_RAM wEnemyMonNick
text "!"
@@ -257,7 +257,7 @@ _TradeWentToText::
done
_TradeForText::
- text "For ", $52, "'s"
+ text "For <PLAYER>'s"
line "@"
TX_RAM wcf4b
text ","
@@ -295,11 +295,11 @@ _TradeWillTradeText::
text " will"
line "trade @"
TX_RAM wcd6d
- db $0
+ text ""
done
_TradeforText::
- text "for ", $52, "'s"
+ text "for <PLAYER>'s"
line "@"
TX_RAM wcf4b
text "."
@@ -351,7 +351,7 @@ _YeahText::
_DexSeenOwnedText::
text "#DEX Seen:@"
TX_NUM wDexRatingNumMonsSeen, 1, 3
- db $0
+ text ""
line " Owned:@"
TX_NUM wDexRatingNumMonsOwned, 1, 3
db "@"
@@ -362,27 +362,27 @@ _DexRatingText::
_GymStatueText1::
TX_RAM wGymCityName
- db $0
+ text ""
line "#MON GYM"
cont "LEADER: @"
TX_RAM wGymLeaderName
- db $0
+ text ""
para "WINNING TRAINERS:"
- line $53
+ line "<RIVAL>"
done
_GymStatueText2::
TX_RAM wGymCityName
- db $0
+ text ""
line "#MON GYM"
cont "LEADER: @"
TX_RAM wGymLeaderName
- db $0
+ text ""
para "WINNING TRAINERS:"
- line $53
- cont $52
+ line "<RIVAL>"
+ cont "<PLAYER>"
done
_ViridianCityPokecenterGuyText::
@@ -627,7 +627,7 @@ _BillsHouseMonitorText::
done
_BillsHouseInitiatedText::
- text $52, " initiated"
+ text "<PLAYER> initiated"
line "TELEPORTER's Cell"
cont "Separator!@@"
@@ -781,12 +781,12 @@ _ViridianSchoolNotebookText4::
line "#MON LEAGUE!"
prompt
-_FightingDojoText_52a10::
+_EnemiesOnEverySideText::
text "Enemies on every"
line "side!"
done
-_FightingDojoText_52a1d::
+_WhatGoesAroundComesAroundText::
text "What goes around"
line "comes around!"
done
@@ -801,7 +801,7 @@ _IndigoPlateauHQText::
done
_RedBedroomSNESText::
- text $52, " is"
+ text "<PLAYER> is"
line "playing the SNES!"
cont "...Okay!"
cont "It's time to go!"
@@ -972,31 +972,31 @@ _VermilionGymTrashFailText::
cont "locks were reset!@@"
_FoundHiddenItemText::
- text $52, " found"
+ text "<PLAYER> found"
line "@"
TX_RAM wcd6d
text "!@@"
_HiddenItemBagFullText::
- text "But, ", $52, " has"
+ text "But, <PLAYER> has"
line "no more room for"
cont "other items!"
done
_FoundHiddenCoinsText::
- text $52, " found"
+ text "<PLAYER> found"
line "@"
- TX_BCD hCoins, $c2
+ TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@@"
_FoundHiddenCoins2Text::
- text $52, " found"
+ text "<PLAYER> found"
line "@"
- TX_BCD hCoins, $c2
+ TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " coins!@@"
_DroppedHiddenCoinsText::
- db $0
+ text ""
para "Oops! Dropped"
line "some coins!"
done
@@ -1050,48 +1050,48 @@ _OutOfSafariBallsText::
_WildRanText::
text "Wild @"
TX_RAM wEnemyMonNick
- db $0
+ text ""
line "ran!"
prompt
_EnemyRanText::
text "Enemy @"
TX_RAM wEnemyMonNick
- db $0
+ text ""
line "ran!"
prompt
_HurtByPoisonText::
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by poison!"
prompt
_HurtByBurnText::
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by the burn!"
prompt
_HurtByLeechSeedText::
text "LEECH SEED saps"
- line $5a, "!"
+ line "<USER>!"
prompt
_EnemyMonFaintedText::
text "Enemy @"
TX_RAM wEnemyMonNick
- db $0
+ text ""
line "fainted!"
prompt
_MoneyForWinningText::
- text $52, " got ¥@"
- TX_BCD wAmountMoneyWon, $c3
- db $0
+ text "<PLAYER> got ¥@"
+ TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+ text ""
line "for winning!"
prompt
_TrainerDefeatedText::
- text $52, " defeated"
+ text "<PLAYER> defeated"
line "@"
TX_RAM wTrainerName
text "!"
@@ -1099,7 +1099,7 @@ _TrainerDefeatedText::
_PlayerMonFaintedText::
TX_RAM wBattleMonNick
- db $0
+ text ""
line "fainted!"
prompt
@@ -1108,20 +1108,20 @@ _UseNextMonText::
done
_Sony1WinText::
- text $53, ": Yeah! Am"
+ text "<RIVAL>: Yeah! Am"
line "I great or what?"
prompt
_PlayerBlackedOutText2::
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " blacked"
+ para "<PLAYER> blacked"
line "out!"
prompt
_LinkBattleLostText::
- text $52, " lost to"
+ text "<PLAYER> lost to"
line "@"
TX_RAM wTrainerName
text "!"
@@ -1135,7 +1135,7 @@ _TrainerAboutToUseText::
TX_RAM wEnemyMonNick
text "!"
- para "Will ", $52
+ para "Will <PLAYER>"
line "change #MON?"
done
@@ -1212,42 +1212,42 @@ _GetOutText::
prompt
_FastAsleepText::
- text $5A
+ text "<USER>"
line "is fast asleep!"
prompt
_WokeUpText::
- text $5A
+ text "<USER>"
line "woke up!"
prompt
_IsFrozenText::
- text $5A
+ text "<USER>"
line "is frozen solid!"
prompt
_FullyParalyzedText::
- text $5A,"'s"
+ text "<USER>'s"
line "fully paralyzed!"
prompt
_FlinchedText::
- text $5A
+ text "<USER>"
line "flinched!"
prompt
_MustRechargeText::
- text $5A
+ text "<USER>"
line "must recharge!"
prompt
_DisabledNoMoreText::
- text $5A,"'s"
+ text "<USER>'s"
line "disabled no more!"
prompt
_IsConfusedText::
- text $5A
+ text "<USER>"
line "is confused!"
prompt
@@ -1257,37 +1257,37 @@ _HurtItselfText::
prompt
_ConfusedNoMoreText::
- text $5A,"'s"
+ text "<USER>'s"
line "confused no more!"
prompt
_SavingEnergyText::
- text $5A
+ text "<USER>"
line "is saving energy!"
prompt
_UnleashedEnergyText::
- text $5A
+ text "<USER>"
line "unleashed energy!"
prompt
_ThrashingAboutText::
- text $5A,"'s"
+ text "<USER>'s"
line "thrashing about!"
done
_AttackContinuesText::
- text $5A,"'s"
+ text "<USER>'s"
line "attack continues!"
done
_CantMoveText::
- text $5A
+ text "<USER>"
line "can't move!"
prompt
_MoveIsDisabledText::
- text $5a, "'s"
+ text "<USER>'s"
line "@"
TX_RAM wcd6d
text " is"
@@ -1295,14 +1295,14 @@ _MoveIsDisabledText::
prompt
_MonName1Text::
- text $5a, "@@"
+ text "<USER>@@"
_Used1Text::
- db $0
+ text ""
line "used @@"
_Used2Text::
- db $0
+ text ""
line "used @@"
_InsteadText::
@@ -1334,24 +1334,24 @@ _ExclamationPoint5Text::
done
_AttackMissedText::
- text $5a, "'s"
+ text "<USER>'s"
line "attack missed!"
prompt
_KeptGoingAndCrashedText::
- text $5a
+ text "<USER>"
line "kept going and"
cont "crashed!"
prompt
_UnaffectedText::
- text $59, "'s"
+ text "<TARGET>'s"
line "unaffected!"
prompt
_DoesntAffectMonText::
text "It doesn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
_CriticalHitText::
@@ -1388,23 +1388,23 @@ _TurnedAwayText::
_IgnoredOrdersText::
TX_RAM wBattleMonNick
- db $0
+ text ""
line "ignored orders!"
prompt
_SubstituteTookDamageText::
text "The SUBSTITUTE"
line "took damage for"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
_SubstituteBrokeText::
- text $59, "'s"
+ text "<TARGET>'s"
line "SUBSTITUTE broke!"
prompt
_BuildingRageText::
- text $5a, "'s"
+ text "<USER>'s"
line "RAGE is building!"
prompt
@@ -1431,6 +1431,7 @@ _WithExpAllText::
_BoostedText::
text "a boosted"
cont "@@"
+
_ExpPointsText::
TX_NUM wExpAmountGained, 2, 4
text " EXP. Points!"
@@ -1446,7 +1447,7 @@ _GrewLevelText::
_WildMonAppearedText::
text "Wild @"
TX_RAM wEnemyMonNick
- db $0
+ text ""
line "appeared!"
prompt
@@ -1454,13 +1455,13 @@ _HookedMonAttackedText::
text "The hooked"
line "@"
TX_RAM wEnemyMonNick
- db $0
+ text ""
cont "attacked!"
prompt
_EnemyAppearedText::
TX_RAM wEnemyMonNick
- db $0
+ text ""
line "appeared!"
prompt
@@ -1513,7 +1514,7 @@ _GoodText::
text "good!@@"
_ComeBackText::
- db $0
+ text ""
line "Come back!"
done
@@ -1543,9 +1544,9 @@ _SafariZoneAngryText::
; money related
_PickUpPayDayMoneyText::
- text $52, " picked up"
+ text "<PLAYER> picked up"
line "¥@"
- TX_BCD wTotalPayDayMoney, $c3
+ TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text "!"
prompt
@@ -1585,7 +1586,7 @@ _PartyMenuSwapMonText::
_PotionText::
TX_RAM wcd6d
- db $0
+ text ""
line "recovered by @"
TX_NUM wHPBarHPDifference, 2, 3
text "!"
@@ -1617,7 +1618,7 @@ _IceHealText::
_AwakeningText::
TX_RAM wcd6d
- db $0
+ text ""
line "woke up!"
done
@@ -1629,7 +1630,7 @@ _FullHealText::
_ReviveText::
TX_RAM wcd6d
- db $0
+ text ""
line "is revitalized!"
done
@@ -1637,11 +1638,11 @@ _RareCandyText::
TX_RAM wcd6d
text " grew"
line "to level @"
- TX_NUM wCurEnemyLVL, $1,$3
+ TX_NUM wCurEnemyLVL, 1, 3
text "!@@"
_TurnedOnPC1Text::
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
@@ -1669,7 +1670,7 @@ _AccessedMyPCText::
prompt
_TurnedOnPC2Text::
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
@@ -1902,13 +1903,13 @@ _DoYouWantToNicknameText::
_YourNameIsText::
text "Right! So your"
- line "name is ", $52, "!"
+ line "name is <PLAYER>!"
prompt
_HisNameIsText::
text "That's right! I"
line "remember now! His"
- cont "name is ", $53, "!"
+ cont "name is <RIVAL>!"
prompt
_WillBeTradedText::
@@ -2011,7 +2012,7 @@ _WouldYouLikeToSaveText::
done
_GameSavedText::
- text $52, " saved"
+ text "<PLAYER> saved"
line "the game!"
done
@@ -2031,7 +2032,7 @@ _WhenYouChangeBoxText::
_ChooseABoxText::
text "Choose a"
- line $4a, " BOX.@@"
+ line "<pkmn> BOX.@@"
_EvolvedText::
TX_RAM wcf4b
@@ -2039,7 +2040,7 @@ _EvolvedText::
done
_IntoText::
- db $0
+ text ""
line "into @"
TX_RAM wcd6d
text "!"
@@ -2048,54 +2049,54 @@ _IntoText::
_StoppedEvolvingText::
text "Huh? @"
TX_RAM wcf4b
- db $0
+ text ""
line "stopped evolving!"
prompt
_IsEvolvingText::
text "What? @"
TX_RAM wcf4b
- db $0
+ text ""
line "is evolving!"
done
_FellAsleepText::
- text $59
+ text "<TARGET>"
line "fell asleep!"
prompt
_AlreadyAsleepText::
- text $59, "'s"
+ text "<TARGET>'s"
line "already asleep!"
prompt
_PoisonedText::
- text $59
+ text "<TARGET>"
line "was poisoned!"
prompt
_BadlyPoisonedText::
- text $59, "'s"
+ text "<TARGET>'s"
line "badly poisoned!"
prompt
_BurnedText::
- text $59
+ text "<TARGET>"
line "was burned!"
prompt
_FrozenText::
- text $59
+ text "<TARGET>"
line "was frozen solid!"
prompt
_FireDefrostedText::
text "Fire defrosted"
- line $59, "!"
+ line "<TARGET>!"
prompt
_MonsStatsRoseText::
- text $5a, "'s"
+ text "<USER>'s"
line "@"
TX_RAM wcf4b
text "@@"
@@ -2108,7 +2109,7 @@ _RoseText::
prompt
_MonsStatsFellText::
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
TX_RAM wcf4b
text "@@"
@@ -2121,60 +2122,60 @@ _FellText::
prompt
_RanFromBattleText::
- text $5a
+ text "<USER>"
line "ran from battle!"
prompt
_RanAwayScaredText::
- text $59
+ text "<TARGET>"
line "ran away scared!"
prompt
_WasBlownAwayText::
- text $59
+ text "<TARGET>"
line "was blown away!"
prompt
_ChargeMoveEffectText::
- text $5a, "@@"
+ text "<USER>@@"
_MadeWhirlwindText::
- db $0
+ text ""
line "made a whirlwind!"
prompt
_TookInSunlightText::
- db $0
+ text ""
line "took in sunlight!"
prompt
_LoweredItsHeadText::
- db $0
+ text ""
line "lowered its head!"
prompt
_SkyAttackGlowingText::
- db $0
+ text ""
line "is glowing!"
prompt
_FlewUpHighText::
- db $0
+ text ""
line "flew up high!"
prompt
_DugAHoleText::
- db $0
+ text ""
line "dug a hole!"
prompt
_BecameConfusedText::
- text $59
+ text "<TARGET>"
line "became confused!"
prompt
_MimicLearnedMoveText::
- text $5a
+ text "<USER>"
line "learned"
cont "@"
TX_RAM wcd6d
@@ -2182,7 +2183,7 @@ _MimicLearnedMoveText::
prompt
_MoveWasDisabledText::
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
TX_RAM wcd6d
text " was"
@@ -2203,16 +2204,16 @@ _ButItFailedText::
_DidntAffectText::
text "It didn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
_IsUnaffectedText::
- text $59
+ text "<TARGET>"
line "is unaffected!"
prompt
_ParalyzedMayNotAttackText::
- text $59, "'s"
+ text "<TARGET>'s"
line "paralyzed! It may"
cont "not attack!"
prompt
@@ -2223,7 +2224,7 @@ _SubstituteText::
prompt
_HasSubstituteText::
- text $5a
+ text "<USER>"
line "has a SUBSTITUTE!"
prompt
@@ -2243,23 +2244,23 @@ _GettingPumpedText::
prompt
_WasSeededText::
- text $59
+ text "<TARGET>"
line "was seeded!"
prompt
_EvadedAttackText::
- text $59
+ text "<TARGET>"
line "evaded attack!"
prompt
_HitWithRecoilText::
- text $5a, "'s"
+ text "<USER>'s"
line "hit with recoil!"
prompt
_ConvertedTypeText::
text "Converted type to"
- line $59, "'s!"
+ line "<TARGET>'s!"
prompt
_StatusChangesEliminatedText::
@@ -2268,23 +2269,23 @@ _StatusChangesEliminatedText::
prompt
_StartedSleepingEffect::
- text $5a
+ text "<USER>"
line "started sleeping!"
done
_FellAsleepBecameHealthyText::
- text $5a
+ text "<USER>"
line "fell asleep and"
cont "became healthy!"
done
_RegainedHealthText::
- text $5a
+ text "<USER>"
line "regained health!"
prompt
_TransformedText::
- text $5a
+ text "<USER>"
line "transformed into"
cont "@"
TX_RAM wcd6d
@@ -2292,28 +2293,28 @@ _TransformedText::
prompt
_LightScreenProtectedText::
- text $5a, "'s"
+ text "<USER>'s"
line "protected against"
cont "special attacks!"
prompt
_ReflectGainedArmorText::
- text $5a
+ text "<USER>"
line "gained armor!"
prompt
_ShroudedInMistText::
- text $5a, "'s"
+ text "<USER>'s"
line "shrouded in mist!"
prompt
_SuckedHealthText::
text "Sucked health from"
- line $59, "!"
+ line "<TARGET>!"
prompt
_DreamWasEatenText::
- text $59, "'s"
+ text "<TARGET>'s"
line "dream was eaten!"
prompt
@@ -2433,15 +2434,15 @@ _PokemartGreetingText::
_PokemonFaintedText::
TX_RAM wcd6d
- db $0
+ text ""
line "fainted!"
done
_PlayerBlackedOutText::
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " blacked"
+ para "<PLAYER> blacked"
line "out!"
prompt
@@ -2459,7 +2460,7 @@ _PokemartTellBuyPriceText::
text "?"
line "That will be"
cont "¥@"
- TX_BCD hMoney, $c3
+ TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text ". OK?"
done
@@ -2486,7 +2487,7 @@ _PokemonSellingGreetingText::
_PokemartTellSellPriceText::
text "I can pay you"
line "¥@"
- TX_BCD hMoney, $c3
+ TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
text " for that."
done
@@ -2530,7 +2531,7 @@ _AbandonLearningText::
_DidNotLearnText::
TX_RAM wLearnMoveMonName
- db $0
+ text ""
line "did not learn"
cont "@"
TX_RAM wcf4b
@@ -2547,7 +2548,7 @@ _TryingToLearnText::
para "But, @"
TX_RAM wLearnMoveMonName
- db $0
+ text ""
line "can't learn more"
cont "than 4 moves!"
@@ -2565,7 +2566,7 @@ _PoofText::
text " Poof!@@"
_ForgotAndText::
- db $0
+ text ""
para "@"
TX_RAM wLearnMoveMonName
text " forgot"
@@ -2721,7 +2722,7 @@ _CannotGetOffHereText::
prompt
_GotMonText::
- text $52, " got"
+ text "<PLAYER> got"
line "@"
TX_RAM wcd6d
text "!@@"
@@ -2818,7 +2819,7 @@ _ItemUseBallText06::
text "!@@"
_SurfingGotOnText::
- text $52, " got on"
+ text "<PLAYER> got on"
line "@"
TX_RAM wcd6d
text "!"
@@ -2843,12 +2844,12 @@ _VitaminNoEffectText::
prompt
_ThrewBaitText::
- text $52, " threw"
+ text "<PLAYER> threw"
line "some BAIT."
done
_ThrewRockText::
- text $52, " threw a"
+ text "<PLAYER> threw a"
line "ROCK."
done
@@ -2866,13 +2867,13 @@ _FluteWokeUpText::
prompt
_PlayedFluteHadEffectText::
- text $52, " played the"
+ text "<PLAYER> played the"
line "# FLUTE.@@"
_CoinCaseNumCoinsText::
text "Coins"
line "@"
- TX_BCD wPlayerCoins, $c2
+ TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
text " "
prompt
@@ -2929,7 +2930,7 @@ _TeachMachineMoveText::
para "Teach @"
TX_RAM wcf4b
- db $0
+ text ""
line "to a #MON?"
done
@@ -2948,7 +2949,7 @@ _MonCannotLearnMachineMoveText::
prompt
_ItemUseNotTimeText::
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that! "
prompt
@@ -2994,7 +2995,7 @@ _BoxFullCannotThrowBallText::
SECTION "Text 11", ROMX, BANK[TEXT_11]
_ItemUseText001::
- text $52," used@@"
+ text "<PLAYER> used@@"
_ItemUseText002::
TX_RAM wcf4b
@@ -3002,7 +3003,7 @@ _ItemUseText002::
done
_GotOnBicycleText1::
- text $52, " got on the@@"
+ text "<PLAYER> got on the@@"
_GotOnBicycleText2::
TX_RAM wcf4b
@@ -3010,7 +3011,7 @@ _GotOnBicycleText2::
prompt
_GotOffBicycleText1::
- text $52, " got off@@"
+ text "<PLAYER> got off@@"
_GotOffBicycleText2::
text "the @"
@@ -3051,7 +3052,7 @@ _ConnectCableText::
prompt
_TradedForText::
- text $52, " traded"
+ text "<PLAYER> traded"
line "@"
TX_RAM wInGameTradeGiveMonName
text " for"
@@ -3103,7 +3104,7 @@ _WannaTrade2Text::
para "your @"
TX_RAM wInGameTradeGiveMonName
- db $0
+ text ""
line "for @"
TX_RAM wInGameTradeReceiveMonName
text "?"