shithub: pokered

Download patch

ref: 3a6a300da48c98ab844ddc4d209abf51adf2aa44
parent: bcb251261dae3cd9ba423fc139c7db4433a1a802
author: YamaArashi <shadow962@live.com>
date: Sun Jun 12 06:11:31 EDT 2016

sync text

--- a/charmap.asm
+++ b/charmap.asm
@@ -147,9 +147,16 @@
 charmap "ょ", $E2
 charmap "ー", $E3
 
+charmap "<pkmn>", $4A ; PkMn
 charmap "@", $50
+charmap "<PLAYER>", $52
+charmap "<RIVAL>", $53
 charmap "#", $54
 ;charmap "POKé", $54
+charmap "<TARGET>", $59
+charmap "<USER>", $5A
+charmap "′", $71
+charmap "″", $73
 charmap "…", $75
 
 charmap "┌", $79
@@ -233,6 +240,7 @@
 charmap "?", $E6
 charmap "!", $E7
 charmap ".", $E8
+charmap "▷", $EC
 charmap "▶", $ED
 charmap "♂", $EF
 charmap "¥", $F0
--- a/constants.asm
+++ b/constants.asm
@@ -30,3 +30,4 @@
 INCLUDE "constants/starter_mons.asm"
 INCLUDE "constants/event_constants.asm"
 INCLUDE "constants/event_macros.asm"
+INCLUDE "constants/text_constants.asm"
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -29,6 +29,16 @@
 D_UP     EQU %01000000
 D_DOWN   EQU %10000000
 
+const_value set 0
+	const BIT_A_BUTTON
+	const BIT_B_BUTTON
+	const BIT_SELECT
+	const BIT_START
+	const BIT_D_RIGHT
+	const BIT_D_LEFT
+	const BIT_D_UP
+	const BIT_D_DOWN
+
 SCREEN_WIDTH  EQU 20
 SCREEN_HEIGHT EQU 18
 
@@ -151,20 +161,6 @@
 FLAG_RESET EQU 0
 FLAG_SET   EQU 1
 FLAG_TEST  EQU 2
-
-; special text IDs
-TEXT_MON_FAINTED      EQU $d0
-TEXT_BLACKED_OUT      EQU $d1
-TEXT_REPEL_WORE_OFF   EQU $d2
-TEXT_SAFARI_GAME_OVER EQU $d3
-
-; PrintNumber
-
-BIT_LEFT_ALIGN     EQU 6
-BIT_LEADING_ZEROES EQU 7
-
-LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
-LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
 
 ; HP bar
 HP_BAR_GREEN  EQU 0
--- /dev/null
+++ b/constants/text_constants.asm
@@ -1,0 +1,14 @@
+; special text IDs
+TEXT_MON_FAINTED      EQU $d0
+TEXT_BLACKED_OUT      EQU $d1
+TEXT_REPEL_WORE_OFF   EQU $d2
+TEXT_SAFARI_GAME_OVER EQU $d3
+
+; PrintNumber
+BIT_MONEY_SIGN     EQU 5
+BIT_LEFT_ALIGN     EQU 6
+BIT_LEADING_ZEROES EQU 7
+
+MONEY_SIGN EQU     (1 << BIT_MONEY_SIGN)
+LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
+LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -199,7 +199,6 @@
 	add hl, de
 	dec c
 	jr nz, .innerLoop
-
 ; Toggle the palette so that the lower star in the small stars tile blinks in
 ; and out.
 	ld a, [rOBP1]
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -58,8 +58,8 @@
 	ld c, 80
 	call DelayFrames
 	coord hl, 2, 13
-	ld b, $3
-	ld c, $e
+	ld b, 3
+	ld c, 14
 	call TextBoxBorder
 	coord hl, 4, 15
 	ld de, HallOfFameText
--- 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 @@
 MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
-INCLUDE "charmap.asm"
 INCLUDE "hram.asm"
 
 
@@ -25,7 +25,7 @@
 	text "Bingo!@@"
 
 _CardKeySuccessText2::
-	db $0
+	text ""
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
@@ -79,7 +79,7 @@
 	done
 
 _FoundItemText::
-	text $52, " found"
+	text "<PLAYER> found"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
@@ -96,7 +96,7 @@
 
 	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 @@
 	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 @@
 	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 @@
 
 	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 @@
 	prompt
 
 _OaksAideGotItemText::
-	text $52, " got the"
+	text "<PLAYER> got the"
 	line "@"
 	TX_RAM wOaksAideRewardItemName
 	text "!@@"
@@ -239,10 +239,10 @@
 
 _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 @@
 	done
 
 _TradeForText::
-	text "For ", $52, "'s"
+	text "For <PLAYER>'s"
 	line "@"
 	TX_RAM wcf4b
 	text ","
@@ -295,11 +295,11 @@
 	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 @@
 _DexSeenOwnedText::
 	text "#DEX   Seen:@"
 	TX_NUM wDexRatingNumMonsSeen, 1, 3
-	db $0
+	text ""
 	line "         Owned:@"
 	TX_NUM wDexRatingNumMonsOwned, 1, 3
 	db "@"
@@ -362,27 +362,27 @@
 
 _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 @@
 	done
 
 _BillsHouseInitiatedText::
-	text $52, " initiated"
+	text "<PLAYER> initiated"
 	line "TELEPORTER's Cell"
 	cont "Separator!@@"
 
@@ -801,7 +801,7 @@
 	done
 
 _RedBedroomSNESText::
-	text $52, " is"
+	text "<PLAYER> is"
 	line "playing the SNES!"
 	cont "...Okay!"
 	cont "It's time to go!"
@@ -972,31 +972,31 @@
 	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,7 +1050,7 @@
 _WildRanText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "ran!"
 	prompt
 
@@ -1057,41 +1057,41 @@
 _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 @@
 
 _PlayerMonFaintedText::
 	TX_RAM wBattleMonNick
-	db $0
+	text ""
 	line "fainted!"
 	prompt
 
@@ -1108,20 +1108,20 @@
 	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 @@
 	TX_RAM wEnemyMonNick
 	text "!"
 
-	para "Will ", $52
+	para "Will <PLAYER>"
 	line "change #MON?"
 	done
 
@@ -1212,42 +1212,42 @@
 	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 @@
 	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 @@
 	prompt
 
 _MonName1Text::
-	text $5a, "@@"
+	text "<USER>@@"
 
 _Used1Text::
-	db $0
+	text ""
 	line "used @@"
 
 _Used2Text::
-	db $0
+	text ""
 	line "used @@"
 
 _InsteadText::
@@ -1334,24 +1334,24 @@
 	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,7 +1388,7 @@
 
 _IgnoredOrdersText::
 	TX_RAM wBattleMonNick
-	db $0
+	text ""
 	line "ignored orders!"
 	prompt
 
@@ -1395,16 +1395,16 @@
 _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 @@
 _BoostedText::
 	text "a boosted"
 	cont "@@"
+
 _ExpPointsText::
 	TX_NUM wExpAmountGained, 2, 4
 	text " EXP. Points!"
@@ -1446,7 +1447,7 @@
 _WildMonAppearedText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "appeared!"
 	prompt
 
@@ -1454,13 +1455,13 @@
 	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 @@
 	text "good!@@"
 
 _ComeBackText::
-	db $0
+	text ""
 	line "Come back!"
 	done
 
@@ -1543,9 +1544,9 @@
 
 ; 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 @@
 
 _PotionText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "recovered by @"
 	TX_NUM wHPBarHPDifference, 2, 3
 	text "!"
@@ -1617,7 +1618,7 @@
 
 _AwakeningText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "woke up!"
 	done
 
@@ -1629,7 +1630,7 @@
 
 _ReviveText::
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "is revitalized!"
 	done
 
@@ -1637,11 +1638,11 @@
 	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 @@
 	prompt
 
 _TurnedOnPC2Text::
-	text $52, " turned on"
+	text "<PLAYER> turned on"
 	line "the PC."
 	prompt
 
@@ -1902,13 +1903,13 @@
 
 _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 @@
 	done
 
 _GameSavedText::
-	text $52, " saved"
+	text "<PLAYER> saved"
 	line "the game!"
 	done
 
@@ -2031,7 +2032,7 @@
 
 _ChooseABoxText::
 	text "Choose a"
-	line $4a, " BOX.@@"
+	line "<pkmn> BOX.@@"
 
 _EvolvedText::
 	TX_RAM wcf4b
@@ -2039,7 +2040,7 @@
 	done
 
 _IntoText::
-	db $0
+	text ""
 	line "into @"
 	TX_RAM wcd6d
 	text "!"
@@ -2048,7 +2049,7 @@
 _StoppedEvolvingText::
 	text "Huh? @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "stopped evolving!"
 	prompt
 
@@ -2055,47 +2056,47 @@
 _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 @@
 	prompt
 
 _MonsStatsFellText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "@"
 	TX_RAM wcf4b
 	text "@@"
@@ -2121,60 +2122,60 @@
 	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 @@
 	prompt
 
 _MoveWasDisabledText::
-	text $59, "'s"
+	text "<TARGET>'s"
 	line "@"
 	TX_RAM wcd6d
 	text " was"
@@ -2203,16 +2204,16 @@
 
 _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 @@
 	prompt
 
 _HasSubstituteText::
-	text $5a
+	text "<USER>"
 	line "has a SUBSTITUTE!"
 	prompt
 
@@ -2243,23 +2244,23 @@
 	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 @@
 	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 @@
 	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 @@
 
 _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 @@
 	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 @@
 _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 @@
 
 _DidNotLearnText::
 	TX_RAM wLearnMoveMonName
-	db $0
+	text ""
 	line "did not learn"
 	cont "@"
 	TX_RAM wcf4b
@@ -2547,7 +2548,7 @@
 
 	para "But, @"
 	TX_RAM wLearnMoveMonName
-	db $0
+	text ""
 	line "can't learn more"
 	cont "than 4 moves!"
 
@@ -2565,7 +2566,7 @@
 	text " Poof!@@"
 
 _ForgotAndText::
-	db $0
+	text ""
 	para "@"
 	TX_RAM wLearnMoveMonName
 	text " forgot"
@@ -2721,7 +2722,7 @@
 	prompt
 
 _GotMonText::
-	text $52, " got"
+	text "<PLAYER> got"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
@@ -2818,7 +2819,7 @@
 	text "!@@"
 
 _SurfingGotOnText::
-	text $52, " got on"
+	text "<PLAYER> got on"
 	line "@"
 	TX_RAM wcd6d
 	text "!"
@@ -2843,12 +2844,12 @@
 	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 @@
 	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 @@
 
 	para "Teach @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "to a #MON?"
 	done
 
@@ -2948,7 +2949,7 @@
 	prompt
 
 _ItemUseNotTimeText::
-	text "OAK: ", $52, "!"
+	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that! "
 	prompt
@@ -2994,7 +2995,7 @@
 SECTION "Text 11", ROMX, BANK[TEXT_11]
 
 _ItemUseText001::
-	text $52," used@@"
+	text "<PLAYER> used@@"
 
 _ItemUseText002::
 	TX_RAM wcf4b
@@ -3002,7 +3003,7 @@
 	done
 
 _GotOnBicycleText1::
-	text $52, " got on the@@"
+	text "<PLAYER> got on the@@"
 
 _GotOnBicycleText2::
 	TX_RAM wcf4b
@@ -3010,7 +3011,7 @@
 	prompt
 
 _GotOffBicycleText1::
-	text $52, " got off@@"
+	text "<PLAYER> got off@@"
 
 _GotOffBicycleText2::
 	text "the @"
@@ -3051,7 +3052,7 @@
 	prompt
 
 _TradedForText::
-	text $52, " traded"
+	text "<PLAYER> traded"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
 	text " for"
@@ -3103,7 +3104,7 @@
 
 	para "your @"
 	TX_RAM wInGameTradeGiveMonName
-	db $0
+	text ""
 	line "for @"
 	TX_RAM wInGameTradeReceiveMonName
 	text "?"
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -25,7 +25,7 @@
 	prompt
 
 _BikeShopText_1d824::
-	text $52, " exchanged"
+	text "<PLAYER> exchanged"
 	line "the BIKE VOUCHER"
 	cont "for a BICYCLE.@@"
 
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -8,7 +8,7 @@
 	prompt
 
 _ReceivedTM18Text::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -83,13 +83,13 @@
 	prompt
 
 ReceivedBikeVoucherText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 ExplainBikeVoucherText::
-	db $0
+	text ""
 	para "Exchange that for"
 	line "a BICYCLE!"
 
@@ -111,7 +111,7 @@
 	done
 
 FanClubChairFinalText::
-	text "Hello, ", $52, "!"
+	text "Hello, <PLAYER>!"
 
 	para "Did you come see"
 	line "me about my"
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -1,7 +1,7 @@
 _HallofFameRoomText1::
 	text "OAK: Er-hem!"
 	line "Congratulations"
-	cont $52, "!"
+	cont "<PLAYER>!"
 
 	para "This floor is the"
 	line "#MON HALL OF"
@@ -16,13 +16,13 @@
 	line "also recorded in"
 	cont "the HALL OF FAME!"
 
-	para $52, "! You have"
+	para "<PLAYER>! You have"
 	line "endeavored hard"
 	cont "to become the new"
 	cont "LEAGUE champion!"
 
 	para "Congratulations,"
-	line $52, ", you and"
+	line "<PLAYER>, you and"
 	cont "your #MON are"
 	cont "HALL OF FAMERs!"
 	done
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -1,6 +1,6 @@
 _LanceBeforeBattleText::
 	text "Ah! I heard about"
-	line "you ", $52, "!"
+	line "you <PLAYER>!"
 
 	para "I lead the ELITE"
 	line "FOUR! You can"
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -81,7 +81,7 @@
 	prompt
 
 _ReceivedOldAmberText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "OLD AMBER!@@"
 
 _Museum1FText_5c299::
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -1,11 +1,11 @@
 _OaksLabGaryText1::
-	text $53,": Yo"
-	line $52,"! Gramps"
+	text "<RIVAL>: Yo"
+	line "<PLAYER>! Gramps"
 	cont "isn't around!"
 	done
 
 _OaksLabText40::
-	text $53,": Heh, I"
+	text "<RIVAL>: Heh, I"
 	line "don't need to be"
 	cont "greedy like you!"
 
@@ -14,7 +14,7 @@
 	done
 
 _OaksLabText41::
-	text $53,": My"
+	text "<RIVAL>: My"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
@@ -60,7 +60,7 @@
 	done
 
 _OaksLabText_1d2f0::
-	text "OAK: Now, ", $52, ","
+	text "OAK: Now, <PLAYER>,"
 	line "which #MON do"
 	cont "you want?"
 	done
@@ -73,7 +73,7 @@
 	done
 
 _OaksLabText_1d2fa::
-	text "OAK: ", $52, ","
+	text "OAK: <PLAYER>,"
 	line "raise your young"
 	cont "#MON by making"
 	cont "it fight!"
@@ -80,7 +80,7 @@
 	done
 
 _OaksLabDeliverParcelText1::
-	text "OAK: Oh, ", $52, "!"
+	text "OAK: Oh, <PLAYER>!"
 
 	para "How is my old"
 	line "#MON?"
@@ -95,11 +95,11 @@
 	para "What? You have"
 	line "something for me?"
 
-	para $52, " delivered"
+	para "<PLAYER> delivered"
 	line "OAK's PARCEL.@@"
 
 _OaksLabDeliverParcelText2::
-	db $0
+	text ""
 	para "Ah! This is the"
 	line "custom # BALL"
 	cont "I ordered!"
@@ -109,7 +109,7 @@
 _OaksLabAroundWorldText::
 	text "#MON around the"
 	line "world wait for"
-	cont "you, ", $52, "!"
+	cont "you, <PLAYER>!"
 	done
 
 _OaksLabGivePokeballsText1::
@@ -123,11 +123,11 @@
 	cont "to capture wild"
 	cont "#MON."
 
-	para $52, " got 5"
+	para "<PLAYER> got 5"
 	line "# BALLs!@@"
 
 _OaksLabGivePokeballsText2::
-	db $0
+	text ""
 	para "When a wild"
 	line "#MON appears,"
 	cont "it's fair game."
@@ -182,13 +182,13 @@
 	done
 
 _OaksLabRivalWaitingText::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
 _OaksLabChooseMonText::
-	text "OAK: ", $53, "?"
+	text "OAK: <RIVAL>?"
 	line "Let me think..."
 
 	para "Oh, that's right,"
@@ -195,7 +195,7 @@
 	line "I told you to"
 	cont "come! Just wait!"
 
-	para "Here, ", $52, "!"
+	para "Here, <PLAYER>!"
 
 	para "There are 3"
 	line "#MON here!"
@@ -216,7 +216,7 @@
 	done
 
 _OaksLabRivalInterjectionText::
-	text $53, ": Hey!"
+	text "<RIVAL>: Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
@@ -223,7 +223,7 @@
 
 _OaksLabBePatientText::
 	text "OAK: Be patient!"
-	line $53, ", you can"
+	line "<RIVAL>, you can"
 	cont "have one too!"
 	done
 
@@ -233,19 +233,19 @@
 	done
 
 _OaksLabRivalPickingMonText::
-	text $53, ": I'll take"
+	text "<RIVAL>: I'll take"
 	line "this one, then!"
 	done
 
 _OaksLabRivalReceivedMonText::
-	text $53, " received"
+	text "<RIVAL> received"
 	line "a @"
 	TX_RAM wcd6d
 	text "!@@"
 
 _OaksLabRivalChallengeText::
-	text $53, ": Wait"
-	line $52, "!"
+	text "<RIVAL>: Wait"
+	line "<PLAYER>!"
 	cont "Let's check out"
 	cont "our #MON!"
 
@@ -261,26 +261,26 @@
 	prompt
 
 _OaksLabText_1d3c3::
-	text $53, ": Yeah! Am"
+	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
 _OaksLabRivalToughenUpText::
-	text $53, ": Okay!"
+	text "<RIVAL>: Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
 	cont "toughen it up!"
 
-	para $52, "! Gramps!"
+	para "<PLAYER>! Gramps!"
 	line "Smell you later!"
 	done
 
 _OaksLabText21::
-	text $53, ": Gramps!"
+	text "<RIVAL>: Gramps!"
 	done
 
 _OaksLabText22::
-	text $53, ": What did"
+	text "<RIVAL>: What did"
 	line "you call me for?"
 	done
 
@@ -305,11 +305,11 @@
 	done
 
 _OaksLabText25::
-	text "OAK: ", $52, " and"
-	line $53, "! Take"
+	text "OAK: <PLAYER> and"
+	line "<RIVAL>! Take"
 	cont "these with you!"
 
-	para $52, " got"
+	para "<PLAYER> got"
 	line "#DEX from OAK!@@"
 
 _OaksLabText26::
@@ -336,11 +336,11 @@
 	done
 
 _OaksLabText27::
-	text $53, ": Alright"
+	text "<RIVAL>: Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
 
-	para $52, ", I hate to"
+	para "<PLAYER>, I hate to"
 	line "say it, but I"
 	cont "don't need you!"
 
@@ -350,7 +350,7 @@
 
 	para "I'll tell her not"
 	line "to lend you one,"
-	cont $52, "! Hahaha!"
+	cont "<PLAYER>! Hahaha!"
 	done
 
 _OaksLabText_1d405::
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -10,7 +10,7 @@
 	done
 
 _MomHealText1::
-	text "MOM: ",$52,"!"
+	text "MOM: <PLAYER>!"
 	line "You should take a"
 	cont "quick rest."
 	prompt
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -60,7 +60,7 @@
 	cont "That's cool!"
 
 	para "Then I'll whip you"
-	line $52, " as a"
+	line "<PLAYER> as a"
 	cont "warm up for"
 	cont "#MON LEAGUE!"
 
@@ -88,8 +88,8 @@
 	prompt
 
 _Route22Text_511d0::
-	text $53, ": Hahaha!"
-	line $52, "! That's"
+	text "<RIVAL>: Hahaha!"
+	line "<PLAYER>! That's"
 	cont "your best? You're"
 	cont "nowhere near as"
 	cont "good as me, pal!"
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -58,7 +58,7 @@
 	done
 
 _SilphCo11Text3::
-	text "Ah ", $52, "!"
+	text "Ah <PLAYER>!"
 	line "So we meet again!"
 
 	para "The PRESIDENT and"
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -35,7 +35,7 @@
 	prompt
 
 _SSAnneFlashedTicketText::
-	text $52, " flashed"
+	text "<PLAYER> flashed"
 	line "the S.S.TICKET!"
 
 	para "Great! Welcome to"
@@ -43,7 +43,7 @@
 	done
 
 _SSAnneNoTicketText::
-	text $52, " doesn't"
+	text "<PLAYER> doesn't"
 	line "have the needed"
 	cont "S.S.TICKET."
 
@@ -71,7 +71,7 @@
 	line "Gogogoh!@@"
 
 _VermilionCityText14::
-	db $0
+	text ""
 	para "A MACHOP is"
 	line "stomping the land"
 	cont "flat."
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -53,4 +53,3 @@
 	cont "with #MON"
 	cont "awaits! Let's go!"
 	done
-