summaryrefslogtreecommitdiff
path: root/text
diff options
context:
space:
mode:
Diffstat (limited to 'text')
-rw-r--r--text/battle.asm291
-rw-r--r--text/common.asm19
-rw-r--r--text/common_2.asm74
-rw-r--r--text/common_3.asm113
-rw-r--r--text/common_4.asm192
-rw-r--r--text/phone/beverly_overworld.asm2
-rw-r--r--text/phone/bill.asm25
-rw-r--r--text/phone/buena.asm32
-rw-r--r--text/phone/elm.asm32
-rw-r--r--text/phone/extra.asm40
-rw-r--r--text/phone/extra3.asm50
-rw-r--r--text/phone/huey_overworld.asm4
-rw-r--r--text/phone/jose_overworld.asm2
-rw-r--r--text/phone/kenji_overworld.asm2
-rw-r--r--text/phone/mom.asm22
-rw-r--r--text/phone/trainers1.asm341
-rw-r--r--text/sweethoney.asm2
17 files changed, 640 insertions, 603 deletions
diff --git a/text/battle.asm b/text/battle.asm
index bc67cd95e..3f29835aa 100644
--- a/text/battle.asm
+++ b/text/battle.asm
@@ -1,5 +1,5 @@
BattleText_0x80730: ; 0x80730
- text $52, " picked up"
+ text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, $36
text "!"
@@ -18,8 +18,8 @@ HookedPokemonAttackedText: ; 0x8075c
text "The hooked"
line "@"
text_from_ram EnemyMonNick
- text $55
- db "attacked!"
+ text ""
+ cont "attacked!"
prompt
; 0x80778
@@ -39,7 +39,7 @@ WildCelebiAppearedText: ; 0x80793
; 0x807a9
WantsToBattleText:: ; 0x807a9
- text $3f
+ text "<ENEMY>"
line "wants to battle!"
prompt
; 0x807bd
@@ -61,43 +61,43 @@ BattleText_0x807cf: ; 0x807cf
; 0x807e2
HurtByPoisonText: ; 0x807e2
- text $5a
+ text "<USER>"
line "is hurt by poison!"
prompt
; 0x807f8
HurtByBurnText: ; 0x807f8
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by its burn!"
prompt
; 0x8080e
LeechSeedSapsText: ; 0x8080e
text "LEECH SEED saps"
- line $5a, "!"
+ line "<USER>!"
prompt
; 0x80822
HasANightmareText: ; 0x80822
- text $5a
+ text "<USER>"
line "has a NIGHTMARE!"
prompt
; 0x80836
HurtByCurseText: ; 0x80836
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by the CURSE!"
prompt
; 0x8084d
SandstormHitsText: ; 0x8084d
text "The SANDSTORM hits"
- line $5a, "!"
+ line "<USER>!"
prompt
; 0x80864
PerishCountText: ; 0x80864
- text $5a, "'s"
+ text "<USER>'s"
line "PERISH count is @"
deciram wd265, $11
text "!"
@@ -105,7 +105,7 @@ PerishCountText: ; 0x80864
; 0x80880
BattleText_0x80880: ; 0x80880
- text $59
+ text "<TARGET>"
line "recovered with"
cont "@"
text_from_ram StringBuffer1
@@ -114,7 +114,7 @@ BattleText_0x80880: ; 0x80880
; 0x80899
BattleText_0x80899: ; 0x80899
- text $5a
+ text "<USER>"
line "recovered PP using"
cont "@"
text_from_ram StringBuffer1
@@ -123,14 +123,14 @@ BattleText_0x80899: ; 0x80899
; 0x808b6
BattleText_0x808b6: ; 0x808b6
- text $59
+ text "<TARGET>"
line "was hit by FUTURE"
cont "SIGHT!"
prompt
; 0x808d2
BattleText_0x808d2: ; 0x808d2
- text $5a, "'s"
+ text "<USER>'s"
line "SAFEGUARD faded!"
prompt
; 0x808e7
@@ -193,26 +193,26 @@ BattleText_0x809a8: ; 0x809a8
; 0x809be
GotMoneyForWinningText:
- text $52, " got ¥@"
+ text "<PLAYER> got ¥@"
deciram wc686, $36
text ""
line "for winning!"
prompt
BattleText_0x809da: ; 0x809da
- text $3f
+ text "<ENEMY>"
line "was defeated!"
prompt
; 0x809eb
TiedAgainstText: ; 0x809eb
text "Tied against"
- line $3f, "!"
+ line "<ENEMY>!"
prompt
; 0x809fc
SentSomeToMomText:
- text $52, " got ¥@"
+ text "<PLAYER> got ¥@"
deciram wc686, $36
text ""
line "for winning!"
@@ -228,7 +228,7 @@ SentAllToMomText:
prompt
BattleText_0x80a4f: ; 0x80a4f
- text $53, ": Huh? I"
+ text "<RIVAL>: Huh? I"
line "should've chosen"
cont "your #MON!"
prompt
@@ -247,7 +247,7 @@ BattleText_0x80a83: ; 0x80a83
; 0x80a93
BattleText_0x80a93: ; 0x80a93
- text $53, ": Yes!"
+ text "<RIVAL>: Yes!"
line "I guess I chose a"
cont "good #MON!"
prompt
@@ -255,24 +255,24 @@ BattleText_0x80a93: ; 0x80a93
LostAgainstText: ; 0x80ab9
text "Lost against"
- line $3f, "!"
+ line "<ENEMY>!"
prompt
; 0x80aca
BattleText_0x80aca: ; 0x80aca
- text $3f
+ text "<ENEMY>"
line "is about to use"
cont "@"
text_from_ram EnemyMonNick
text "."
- para "Will ", $52
+ para "Will <PLAYER>"
line "change #MON?"
done
; 0x80af8
BattleText_0x80af8: ; 0x80af8
- text $3f
+ text "<ENEMY>"
line "sent out"
cont "@"
text_from_ram EnemyMonNick
@@ -310,7 +310,7 @@ BattleText_0x80b77: ; 0x80b77
; 0x80b89
BattleText_0x80b89: ; 0x80b89
- text $5a
+ text "<USER>"
line "fled using a"
cont "@"
text_from_ram StringBuffer1
@@ -324,13 +324,13 @@ BattleText_0x80ba0: ; 0x80ba0
; 0x80bae
BattleText_0x80bae: ; 0x80bae
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by SPIKES!"
prompt
; 0x80bc2
RecoveredUsingText: ; 0x80bc2
- text $59
+ text "<TARGET>"
line "recovered using a"
cont "@"
text_from_ram StringBuffer1
@@ -339,11 +339,11 @@ RecoveredUsingText: ; 0x80bc2
; 0x80bde
BattleText_0x80bde: ; 0x80bde
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer1
- text $55
- db "activated!"
+ text ""
+ cont "activated!"
prompt
; 0x80bf3
@@ -387,7 +387,7 @@ BattleText_0x80c72: ; 0x80c72
; 0x80c8a
BattleText_0x80c8a: ; 0x80c8a
- text $59, "'s"
+ text "<TARGET>'s"
line "ENCORE ended!"
prompt
; 0x80c9c
@@ -423,43 +423,43 @@ BattleText_0x80cd1: ; 0x80cd1
; 0x80ce7
FastAsleepText: ; 0x80ce7
- text $5a
+ text "<USER>"
line "is fast asleep!"
prompt
; 0x80cfa
WokeUpText: ; 0x80cfa
- text $5a
+ text "<USER>"
line "woke up!"
prompt
; 0x80d06
FrozenSolidText: ; 0x80d06
- text $5a
+ text "<USER>"
line "is frozen solid!"
prompt
; 0x80d1a
FlinchedText: ; 0x80d1a
- text $5a
+ text "<USER>"
line "flinched!"
prompt
; 0x80d27
MustRechargeText: ; 0x80d27
- text $5a
+ text "<USER>"
line "must recharge!"
prompt
; 0x80d39
DisabledNoMoreText: ; 0x80d39
- text $5a, "'s"
+ text "<USER>'s"
line "disabled no more!"
prompt
; 0x80d4f
IsConfusedText: ; 0x80d4f
- text $5a
+ text "<USER>"
line "is confused!"
prompt
; 0x80d5f
@@ -471,13 +471,13 @@ HurtItselfText: ; 0x80d5f
; 0x80d81
ConfusedNoMoreText: ; 0x80d81
- text $5a, "'s"
+ text "<USER>'s"
line "confused no more!"
prompt
; 0x80d97
BecameConfusedText: ; 0x80d97
- text $59
+ text "<TARGET>"
line "became confused!"
prompt
; 0x80dab
@@ -486,19 +486,19 @@ BattleText_0x80dab: ; 0x80dab
text "A @"
text_from_ram StringBuffer1
text " rid"
- line $59
+ line "<TARGET>"
cont "of its confusion."
prompt
; 0x80dcc
AlreadyConfusedText: ; 0x80dcc
- text $59, "'s"
+ text "<TARGET>'s"
line "already confused!"
prompt
; 0x80de2
BattleText_0x80de2: ; 0x80de2
- text $5a, "'s"
+ text "<USER>'s"
line "hurt by"
cont "@"
text_from_ram StringBuffer1
@@ -507,7 +507,7 @@ BattleText_0x80de2: ; 0x80de2
; 0x80df5
BattleText_0x80df5: ; 0x80df5
- text $5a
+ text "<USER>"
line "was released from"
cont "@"
text_from_ram StringBuffer1
@@ -516,52 +516,52 @@ BattleText_0x80df5: ; 0x80df5
; 0x80e11
UsedBindText: ; 0x80e11
- text $5a
+ text "<USER>"
line "used BIND on"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x80e24
WhirlpoolTrapText: ; 0x80e24
- text $59
+ text "<TARGET>"
line "was trapped!"
prompt
; 0x80e34
FireSpinTrapText: ; 0x80e34
- text $59
+ text "<TARGET>"
line "was trapped!"
prompt
; 0x80e44
WrappedByText: ; 0x80e44
- text $59
+ text "<TARGET>"
line "was WRAPPED by"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x80e59
ClampedByText: ; 0x80e59
- text $59
+ text "<TARGET>"
line "was CLAMPED by"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x80e6e
StoringEnergyText: ; 0x80e6e
- text $5a
+ text "<USER>"
line "is storing energy!"
prompt
; 0x80e84
UnleashedEnergyText: ; 0x80e84
- text $5a
+ text "<USER>"
line "unleashed energy!"
prompt
; 0x80e99
HungOnText: ; 0x80e99
- text $59
+ text "<TARGET>"
line "hung on with"
cont "@"
text_from_ram StringBuffer1
@@ -570,27 +570,27 @@ HungOnText: ; 0x80e99
; 0x80eb0
EnduredText: ; 0x80eb0
- text $59
+ text "<TARGET>"
line "ENDURED the hit!"
prompt
; 0x80ec4
InLoveWithText: ; 0x80ec4
- text $5a
+ text "<USER>"
line "is in love with"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x80eda
InfatuationText: ; 0x80eda
- text $5a, "'s"
+ text "<USER>'s"
line "infatuation kept"
cont "it from attacking!"
prompt
; 0x80f02
DisabledMoveText: ; 0x80f02
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer1
text " is"
@@ -647,7 +647,7 @@ NoPPLeftText: ; 0x80f99
; 0x80fba
HasNoPPLeftText: ; 0x80fba
- text $5a
+ text "<USER>"
line "has no PP left for"
cont "@"
text_from_ram StringBuffer2
@@ -656,52 +656,52 @@ HasNoPPLeftText: ; 0x80fba
; 0x80fd7
WentToSleepText: ; 0x80fd7
- text $5a
+ text "<USER>"
line "went to sleep!"
done
; 0x80fe9
RestedText: ; 0x80fe9
- text $5a
+ text "<USER>"
line "fell asleep and"
cont "became healthy!"
done
; 0x8100c
RegainedHealthText: ; 0x8100c
- text $5a
+ text "<USER>"
line "regained health!"
prompt
; 0x81020
AttackMissedText: ; 0x81020
- text $5a, "'s"
+ text "<USER>'s"
line "attack missed!"
prompt
; 0x81033
AttackMissed2Text: ; 0x81033
- text $5a, "'s"
+ text "<USER>'s"
line "attack missed!"
prompt
; 0x81046
CrashedText: ; 0x81046
- text $5a
+ text "<USER>"
line "kept going and"
cont "crashed!"
prompt
; 0x81061
UnaffectedText: ; 0x81061
- text $59, "'s"
+ text "<TARGET>'s"
line "unaffected!"
prompt
; 0x81071
DoesntAffectText: ; 0x81071
text "It doesn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81086
@@ -728,20 +728,20 @@ NotVeryEffectiveText: ; 0x810c1
; 0x810da
TookDownWithItText: ; 0x810da
- text $59
+ text "<TARGET>"
line "took down with it,"
- cont $5a, "!"
+ cont "<USER>!"
prompt
; 0x810f3
RageBuildingText: ; 0x810f3
- text $5a, "'s"
+ text "<USER>'s"
line "RAGE is building!"
prompt
; 0x81109
GotAnEncoreText: ; 0x81109
- text $59
+ text "<TARGET>"
line "got an ENCORE!"
prompt
; 0x8111b
@@ -753,13 +753,13 @@ SharedPainText: ; 0x8111b
; 0x81136
TookAimText: ; 0x81136
- text $5a
+ text "<USER>"
line "took aim!"
prompt
; 0x81143
SketchedText: ; 0x81143
- text $5a
+ text "<USER>"
line "SKETCHED"
cont "@"
text_from_ram StringBuffer1
@@ -768,14 +768,14 @@ SketchedText: ; 0x81143
; 0x81156
DestinyBondEffectText: ; 0x81156
- text $5a, "'s"
+ text "<USER>'s"
line "trying to take its"
cont "opponent with it!"
prompt
; 0x8117f
SpiteEffectText: ; 0x8117f
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text " was"
@@ -792,67 +792,67 @@ BellChimedText: ; 0x811a0
; 0x811b1
FellAsleepText: ; 0x811b1
- text $59
+ text "<TARGET>"
line "fell asleep!"
prompt
; 0x811c1
AlreadyAsleepText: ; 0x811c1
- text $59, "'s"
+ text "<TARGET>'s"
line "already asleep!"
prompt
; 0x811d5
WasPoisonedText: ; 0x811d5
- text $59
+ text "<TARGET>"
line "was poisoned!"
prompt
; 0x811e6
BadlyPoisonedText: ; 0x811e6
- text $59, "'s"
+ text "<TARGET>'s"
line "badly poisoned!"
prompt
; 0x811fa
AlreadyPoisonedText: ; 0x811fa
- text $59, "'s"
+ text "<TARGET>'s"
line "already poisoned!"
prompt
; 0x81210
SuckedHealthText: ; 0x81210
text "Sucked health from"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81227
DreamEatenText: ; 0x81227
- text $59, "'s"
+ text "<TARGET>'s"
line "dream was eaten!"
prompt
; 0x8123c
WasBurnedText: ; 0x8123c
- text $59
+ text "<TARGET>"
line "was burned!"
prompt
; 0x8124b
DefrostedOpponentText: ; 0x8124b
- text $59
+ text "<TARGET>"
line "was defrosted!"
prompt
; 0x8125d
WasFrozenText: ; 0x8125d
- text $59
+ text "<TARGET>"
line "was frozen solid!"
prompt
; 0x81272
WontRiseAnymoreText: ; 0x81272
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer2
text " won't"
@@ -861,7 +861,7 @@ WontRiseAnymoreText: ; 0x81272
; 0x8128f
WontDropAnymoreText: ; 0x8128f
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
text " won't"
@@ -870,19 +870,19 @@ WontDropAnymoreText: ; 0x8128f
; 0x812ac
FledFromBattleText:: ; 0x812ac
- text $5a
+ text "<USER>"
line "fled from battle!"
prompt
; 0x812c1
FledInFearText: ; 0x812c1
- text $59
+ text "<TARGET>"
line "fled in fear!"
prompt
; 0x812d2
BlownAwayText: ; 0x812d2
- text $59
+ text "<TARGET>"
line "was blown away!"
prompt
; 0x812e5
@@ -902,38 +902,38 @@ EnemyHitTimesText: ; 0x812f8
; 0x8130b
MistText: ; 0x8130b
- text $5a, "'s"
+ text "<USER>'s"
line "shrouded in MIST!"
prompt
; 0x81321
ProtectedByMistText: ; 0x81321
- text $59, "'s"
+ text "<TARGET>'s"
line "protected by MIST."
prompt
; 0x81338
GettingPumpedText: ; 0x81338
interpret_data
- text $5a, "'s"
+ text "<USER>'s"
line "getting pumped!"
prompt
; 0x8134d
RecoilText: ; 0x8134d
- text $5a, "'s"
+ text "<USER>'s"
line "hit with recoil!"
prompt
; 0x81362
MadeSubstituteText: ; 0x81362
- text $5a
+ text "<USER>"
line "made a SUBSTITUTE!"
prompt
; 0x81378
HasSubstituteText: ; 0x81378
- text $5a
+ text "<USER>"
line "has a SUBSTITUTE!"
prompt
; 0x8138d
@@ -947,18 +947,18 @@ TooWeakSubText: ; 0x8138d
SubTookDamageText: ; 0x813ad
text "The SUBSTITUTE"
line "took damage for"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x813d0
SubFadedText: ; 0x813d0
- text $59, "'s"
+ text "<TARGET>'s"
line "SUBSTITUTE faded!"
prompt
; 0x813e6
LearnedMoveText: ; 0x813e6
- text $5a
+ text "<USER>"
line "learned"
cont "@"
text_from_ram StringBuffer1
@@ -967,19 +967,19 @@ LearnedMoveText: ; 0x813e6
; 0x813f8
WasSeededText: ; 0x813f8
- text $59
+ text "<TARGET>"
line "was seeded!"
prompt
; 0x81407
EvadedText: ; 0x81407
- text $59
+ text "<TARGET>"
line "evaded the attack!"
prompt
; 0x8141d
WasDisabledText: ; 0x8141d
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text " was"
@@ -994,7 +994,7 @@ CoinsScatteredText: ; 0x81435
; 0x81452
TransformedTypeText: ; 0x81452
- text $5a
+ text "<USER>"
line "transformed into"
cont "the @"
text_from_ram StringBuffer1
@@ -1009,7 +1009,7 @@ EliminatedStatsText: ; 0x81476
; 0x81499
TransformedText: ; 0x81499
- text $5a
+ text "<USER>"
line "TRANSFORMED into"
cont "@"
text_from_ram StringBuffer1
@@ -1018,13 +1018,13 @@ TransformedText: ; 0x81499
; 0x814b4
LightScreenEffectText: ; 0x814b4
- text $5a, "'s"
+ text "<USER>'s"
line "SPCL.DEF rose!"
prompt
; 0x814c7
ReflectEffectText: ; 0x814c7
- text $5a, "'s"
+ text "<USER>'s"
line "DEFENSE rose!"
prompt
; 0x814d9
@@ -1047,49 +1047,49 @@ ItFailedText: ; 0x81500
DidntAffect1Text: ; 0x8150c
text "It didn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81520
DidntAffect2Text: ; 0x81520
text "It didn't affect"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81534
HPIsFullText: ; 0x81534
- text $5a, "'s"
+ text "<USER>'s"
line "HP is full!"
prompt
; 0x81544
DraggedOutText: ; 0x81544
- text $5a
+ text "<USER>"
line "was dragged out!"
prompt
; 0x81558
ParalyzedText: ; 0x81558
- text $59, "'s"
+ text "<TARGET>'s"
line "paralyzed! Maybe"
cont "it can't attack!"
prompt
; 0x8157d
FullyParalyzedText: ; 0x8157d
- text $5a, "'s"
+ text "<USER>'s"
line "fully paralyzed!"
prompt
; 0x81592
AlreadyParalyzedText: ; 0x81592
- text $59, "'s"
+ text "<TARGET>'s"
line "already paralyzed!"
prompt
; 0x815a9
ProtectedByText: ; 0x815a9
- text $59, "'s"
+ text "<TARGET>'s"
line "protected by"
cont "@"
text_from_ram StringBuffer1
@@ -1098,55 +1098,56 @@ ProtectedByText: ; 0x815a9
; 0x815c1
MirrorMoveFailedText: ; 0x815c1
- text "The MIRROR MOVE", $4e, "failed!"
+ text "The MIRROR MOVE"
+ next "failed!"
prompt
; 0x815da
StoleText: ; 0x815da
- text $5a
+ text "<USER>"
line "stole @"
text_from_ram StringBuffer1
- text $55
- db "from its foe!"
+ text ""
+ cont "from its foe!"
prompt
; 0x815f7
CantEscapeNowText: ; 0x815f7
- text $59
+ text "<TARGET>"
line "can't escape now!"
prompt
; 0x8160b
StartedNightmareText: ; 0x8160b
- text $59
+ text "<TARGET>"
line "started to have a"
cont "NIGHTMARE!"
prompt
; 0x8162b
WasDefrostedText: ; 0x8162b
- text $5a
+ text "<USER>"
line "was defrosted!"
prompt
; 0x8163d
PutACurseText: ; 0x8163d
- text $5a
+ text "<USER>"
line "cut its own HP and"
para "put a CURSE on"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81665
ProtectedItselfText: ; 0x81665
- text $5a
+ text "<USER>"
line "PROTECTED itself!"
prompt
; 0x8167a
ProtectingItselfText: ; 0x8167a
- text $59, "'s"
+ text "<TARGET>'s"
line "PROTECTING itself!"
done
; 0x81691
@@ -1154,14 +1155,14 @@ ProtectingItselfText: ; 0x8167a
SpikesText: ; 0x81691
text "SPIKES scattered"
line "all around"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x816b1
IdentifiedText: ; 0x816b1
- text $5a
+ text "<USER>"
line "identified"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x816c2
@@ -1178,25 +1179,25 @@ SandstormBrewedText: ; 0x816e4
; 0x816f9
BracedItselfText: ; 0x816f9
- text $5a
+ text "<USER>"
line "braced itself!"
prompt
; 0x8170b
FellInLoveText: ; 0x8170b
- text $59
+ text "<TARGET>"
line "fell in love!"
prompt
; 0x8171c
CoveredByVeilText: ; 0x8171c
- text $5a, "'s"
+ text "<USER>'s"
line "covered by a veil!"
prompt
; 0x81733
SafeguardProtectText: ; 0x81733
- text $59
+ text "<TARGET>"
line "is protected by"
cont "SAFEGUARD!"
prompt
@@ -1210,20 +1211,20 @@ MagnitudeText: ; 0x81751
; 0x81764
ReleasedByText: ; 0x81764
- text $5a
+ text "<USER>"
line "was released by"
- cont $59, "!"
+ cont "<TARGET>!"
prompt
; 0x8177a
ShedLeechSeedText: ; 0x8177a
- text $5a
+ text "<USER>"
line "shed LEECH SEED!"
prompt
; 0x8178e
BlewSpikesText: ; 0x8178e
- text $5a
+ text "<USER>"
line "blew away SPIKES!"
prompt
; 0x817a3
@@ -1241,23 +1242,23 @@ SunGotBrightText: ; 0x817b8
; 0x817d2
BellyDrumText: ; 0x817d2
- text $5a
+ text "<USER>"
line "cut its HP and"
cont "maximized ATTACK!"
prompt
; 0x817f6
CopiedStatsText: ; 0x817f6
- text $5a
+ text "<USER>"
line "copied the stat"
para "changes of"
- line $59, "!"
+ line "<TARGET>!"
prompt
; 0x81817
ForesawAttackText: ; 0x81817
- text $5a
+ text "<USER>"
line "foresaw an attack!"
prompt
; 0x8182d
@@ -1270,13 +1271,13 @@ BeatUpAttackText: ; 0x8182d
; 0x8183b
RefusedGiftText: ; 0x8183b
- text $59
+ text "<TARGET>"
line "refused the gift!"
prompt
; 0x81850
IgnoredOrders2Text: ; 0x81850
- text $5a
+ text "<USER>"
line "ignored orders!"
prompt
; 0x81863
diff --git a/text/common.asm b/text/common.asm
index f528f0bcc..74e143b13 100644
--- a/text/common.asm
+++ b/text/common.asm
@@ -247,9 +247,9 @@ UnknownText_0x1b05bf: ; 0x1b05bf
; 0x1b0621
UnknownText_0x1b0621: ; 0x1b0621
- text $52, ", the No.@"
+ text "<PLAYER>, the No.@"
text_from_ram StringBuffer3
- db $0
+ text ""
line "finisher, wins"
cont "@"
text_from_ram StringBuffer4
@@ -258,7 +258,7 @@ UnknownText_0x1b0621: ; 0x1b0621
; 0x1b0648
UnknownText_0x1b0648: ; 0x1b0648
- text $52, " received"
+ text "<PLAYER> received"
line "@"
text_from_ram StringBuffer4
text "."
@@ -304,7 +304,7 @@ UnknownText_0x1b070d: ; 0x1b070d
UnknownText_0x1b074e: ; 0x1b074e
text_from_ram StringBuffer3
- db $0
+ text ""
line "#MON GYM"
done
; 0x1b075c
@@ -312,9 +312,10 @@ UnknownText_0x1b074e: ; 0x1b074e
UnknownText_0x1b075c: ; 0x1b075c
text "LEADER: @"
text_from_ram StringBuffer4
- db $0, $51
- db "WINNING TRAINERS:"
- line $52, $57
+ text ""
+ para "WINNING TRAINERS:"
+ line "<PLAYER>"
+ done
; 0x1b077f
UnknownText_0x1b077f: ; 0x1b077f
@@ -408,14 +409,14 @@ HappinessText1:
done
RegisteredNumber1Text:
- text $52, " registered"
+ text "<PLAYER> registered"
line "@"
text_from_ram StringBuffer3
text "'s number."
done
RegisteredNumber2Text:
- text $52, " registered"
+ text "<PLAYER> registered"
line "@"
text_from_ram StringBuffer3
text "'s number."
diff --git a/text/common_2.asm b/text/common_2.asm
index 7287ad78f..60a92f0c3 100644
--- a/text/common_2.asm
+++ b/text/common_2.asm
@@ -144,27 +144,31 @@ UnknownText_0x1bc1cf: ; 0x1bc1cf
UnknownText_0x1bc1eb: ; 0x1bc1eb
text "Your PASSCODE has"
- line "been set.", $51
- db "Enter this number"
- line "next time to open", $55
- db "the CARD FOLDER.", $51
- db $57
+ line "been set."
+ para "Enter this number"
+ line "next time to open"
+ cont "the CARD FOLDER."
+ para ""
+ done
; 0x1bc23e
UnknownText_0x1bc23e: ; 0x1bc23e
- text "0000 is invalid!", $51
- db $57
+ text "0000 is invalid!"
+ para ""
+ done
; 0x1bc251
UnknownText_0x1bc251: ; 0x1bc251
- text "Enter the CARD", $4e, "FOLDER PASSCODE."
+ text "Enter the CARD"
+ next "FOLDER PASSCODE."
done
; 0x1bc272
UnknownText_0x1bc272: ; 0x1bc272
text "Incorrect"
- line "PASSCODE!", $51
- db $57
+ line "PASSCODE!"
+ para ""
+ done
; 0x1bc288
UnknownText_0x1bc288: ; 0x1bc288
@@ -283,7 +287,8 @@ UnknownText_0x1bc404: ; 0x1bc404
UnknownText_0x1bc42c: ; 0x1bc42c
text "The password is:"
- line $57
+ line ""
+ done
; 0x1bc43f
UnknownText_0x1bc43f: ; 0x1bc43f
@@ -347,8 +352,8 @@ UnknownText_0x1bc51c: ; 0x1bc51c
text "Put away the"
line "@"
text_from_ram StringBuffer3
- text $51
- db "and set up the"
+ text ""
+ para "and set up the"
line "@"
text_from_ram StringBuffer4
text "."
@@ -399,7 +404,7 @@ UnknownText_0x1bc5ef: ; 0x1bc5ef
; 0x1bc615
UnknownText_0x1bc615: ; 0x1bc615
- text "Hi, ", $52, "!"
+ text "Hi, <PLAYER>!"
line "How are you?"
prompt
; 0x1bc62a
@@ -1286,11 +1291,12 @@ UnknownText_0x1bcf96: ; 0x1bcf96
UnknownText_0x1bcf99: ; 0x1bcf99
text ""
- line $57
+ line ""
+ done
; 0x1bcf9c
UnknownText_0x1bcf9c: ; 0x1bcf9c
- text $3f
+ text "<ENEMY>"
line "withdrew"
cont "@"
text_from_ram EnemyMonNick
@@ -1299,11 +1305,11 @@ UnknownText_0x1bcf9c: ; 0x1bcf9c
; 0x1bcfaf
UnknownText_0x1bcfaf: ; 0x1bcfaf
- text $3f
+ text "<ENEMY>"
line "used @"
text_from_ram wd050
- text $55
- db "on @"
+ text ""
+ cont "on @"
text_from_ram EnemyMonNick
text "!"
prompt
@@ -1383,7 +1389,8 @@ UnknownText_0x1bd0d8: ; 0x1bd0d8
UnknownText_0x1bd109: ; 0x1bd109
text "There is no EGG."
- line $58
+ line ""
+ prompt
; 0x1bd11c
UnknownText_0x1bd11c: ; 0x1bd11c
@@ -1528,7 +1535,7 @@ UnknownText_0x1bd308: ; 0x1bd308
; 0x1bd321
UnknownText_0x1bd321: ; 0x1bd321
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -1536,7 +1543,7 @@ UnknownText_0x1bd321: ; 0x1bd321
; 0x1bd331
UnknownText_0x1bd331: ; 0x1bd331
- text "But ", $52, " has"
+ text "But <PLAYER> has"
line "no space left…"
done
; 0x1bd34b
@@ -1595,11 +1602,11 @@ UnknownText_0x1bd407: ; 0x1bd407
; 0x1bd429
UnknownText_0x1bd429: ; 0x1bd429
- text $52, " traded"
+ text "<PLAYER> traded"
line "@"
text_from_ram wd050
- text " for", $55
- db "@"
+ text " for"
+ cont "@"
text_from_ram StringBuffer2
text ".@"
db "@"
@@ -1815,8 +1822,9 @@ UnknownText_0x1bd77f: ; 0x1bd77f
UnknownText_0x1bd868: ; 0x1bd868
text "OK, I'll take care"
- line "of your money.", $51
- db $56, $56, $56, $58
+ line "of your money."
+ para $56, $56, $56
+ prompt
; 0x1bd88e
UnknownText_0x1bd88e: ; 0x1bd88e
@@ -1895,7 +1903,7 @@ UnknownText_0x1bda25: ; 0x1bda25
text "OK, I'll save your"
line "money. Trust me!"
- para $52, ", stick"
+ para "<PLAYER>, stick"
line "with it!"
done
; 0x1bda5b
@@ -1907,7 +1915,7 @@ UnknownText_0x1bda5b: ; 0x1bda5b
; 0x1bda7e
UnknownText_0x1bda7e: ; 0x1bda7e
- text $52, ", don't"
+ text "<PLAYER>, don't"
line "give up!"
done
; 0x1bda90
@@ -2059,7 +2067,7 @@ UnknownText_0x1bde04: ; 0x1bde04
; 0x1bde1f
UnknownText_0x1bde1f: ; 0x1bde1f
- text $52, " got back"
+ text "<PLAYER> got back"
line "@"
text_from_ram StringBuffer1
text "."
@@ -2070,8 +2078,8 @@ UnknownText_0x1bde32: ; 0x1bde32
text "Huh? Back already?"
line "Your @"
text_from_ram StringBuffer1
- text $51
- db "needs a little"
+ text ""
+ para "needs a little"
line "more time with us."
para "If you want your"
@@ -2128,7 +2136,7 @@ UnknownText_0x1bdf00: ; 0x1bdf00
; 0x1bdfa5
UnknownText_0x1bdfa5: ; 0x1bdfa5
- text $52, " received"
+ text "<PLAYER> received"
line "the EGG!"
done
; 0x1bdfba
diff --git a/text/common_3.asm b/text/common_3.asm
index 5599301df..7b15baf5e 100644
--- a/text/common_3.asm
+++ b/text/common_3.asm
@@ -292,8 +292,8 @@ UnknownText_0x1c04fa: ; 1c04fa
text " sent"
line "@"
text_from_ram StringBuffer1
- text $55
- db "to @"
+ text ""
+ cont "to @"
text_from_ram wc950 + 3
text "'s home."
prompt
@@ -422,7 +422,7 @@ UnknownText_0x1c06de: ; 1c06de
; 1c06ed
UnknownText_0x1c06ed: ; 1c06ed
- text $52, " used an"
+ text "<PLAYER> used an"
line "ESCAPE ROPE."
done
; 1c0705
@@ -441,8 +441,9 @@ UnknownText_0x1c071a: ; 1c071a
UnknownText_0x1c073b: ; 1c073b
text "Can't use that"
- line "here.", $51
- db $57
+ line "here."
+ para ""
+ done
; 1c0751
UnknownText_0x1c0751: ; 1c0751
@@ -578,7 +579,7 @@ UnknownText_0x1c099a: ; 1c099a
; 1c09b2
UnknownText_0x1c09b2: ; 1c09b2
- text $52, " got on the"
+ text "<PLAYER> got on the"
line "@"
text_from_ram StringBuffer2
text "."
@@ -586,7 +587,7 @@ UnknownText_0x1c09b2: ; 1c09b2
; 1c09c7
UnknownText_0x1c09c7: ; 1c09c7
- text $52, " got off"
+ text "<PLAYER> got off"
line "the @"
text_from_ram StringBuffer2
text "."
@@ -608,7 +609,7 @@ UnknownText_0x1c0a05: ; 1c0a05
; 1c0a1c
UnknownText_0x1c0a1c: ; 1c0a1c
- text $52, " found"
+ text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
@@ -616,17 +617,17 @@ UnknownText_0x1c0a1c: ; 1c0a1c
; 1c0a2c
UnknownText_0x1c0a2c: ; 1c0a2c
- text "But ", $52, " can't"
+ text "But <PLAYER> can't"
line "carry any more"
cont "items."
done
; 1c0a4e
UnknownText_0x1c0a4e: ; 1c0a4e
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " whited"
+ para "<PLAYER> whited"
line "out!"
done
; 1c0a77
@@ -652,10 +653,10 @@ UnknownText_0x1c0acc: ; 1c0acc
; 1c0ada
UnknownText_0x1c0ada: ; 1c0ada
- text $52, " is out of"
+ text "<PLAYER> is out of"
line "useable #MON!"
- para $52, " whited"
+ para "<PLAYER> whited"
line "out!"
prompt
; 1c0b03
@@ -674,7 +675,7 @@ UnknownText_0x1c0b1a: ; 1c0b1a
; 1c0b3b
UnknownText_0x1c0b3b: ; 1c0b3b
- text $52, " sprinkled"
+ text "<PLAYER> sprinkled"
line "water."
para "But nothing"
@@ -683,7 +684,7 @@ UnknownText_0x1c0b3b: ; 1c0b3b
; 1c0b65
UnknownText_0x1c0b65: ; 1c0b65
- text $52, "'s #MON"
+ text "<PLAYER>'s #MON"
line "were all healed!"
done
; 1c0b7f
@@ -724,7 +725,7 @@ UnknownText_0x1c0bd8: ; 1c0bd8
; 1c0bee
UnknownText_0x1c0bee: ; 1c0bee
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
prompt
@@ -774,7 +775,7 @@ UnknownText_0x1c0ca3: ; 1c0ca3
; 1c0cc6
UnknownText_0x1c0cc6: ; 1c0cc6
- text $5a, "'s"
+ text "<USER>'s"
line "@"
text_from_ram StringBuffer2
db "@"
@@ -796,7 +797,7 @@ UnknownText_0x1c0ce0: ; 1c0ce0
; 1c0ceb
UnknownText_0x1c0ceb: ; 1c0ceb
- text $59, "'s"
+ text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
db "@"
@@ -818,7 +819,7 @@ UnknownText_0x1c0d06: ; 1c0d06
; 1c0d0e
UnknownText_0x1c0d0e: ; 1c0d0e
- text $5a, "@"
+ text "<USER>@"
db "@"
; 1c0d12
@@ -859,7 +860,7 @@ UnknownText_0x1c0d6c: ; 1c0d6c
; 1c0d7a
_ActorNameText: ; 1c0d7a
- text $5a, "@"
+ text "<USER>@"
db "@"
; 1c0d7e
@@ -876,8 +877,8 @@ _UsedMove2Text: ; 1c0d87
; 1c0d90
_UsedInsteadText: ; 1c0d90
- text "instead,", $55
- db "@"
+ text "instead,"
+ cont "@"
db "@"
; 1c0d9c
@@ -916,8 +917,8 @@ _EndUsedMove5Text: ; 1c0dad
; 1c0db0
UnknownText_0x1c0db0: ; 1c0db0
- text "Huh?", $51
- db "@"
+ text "Huh?"
+ para "@"
db "@"
; 1c0db8
@@ -1142,20 +1143,20 @@ UnknownText_0x1c10fa: ; 1c10fa
text "This Bug-Catching"
line "Contest winner is@"
interpret_data
- text "…", $51
- db "@"
+ text "…"
+ para "@"
text_from_ram wd016
text ","
- line "who caught a", $55
- db "@"
+ line "who caught a"
+ cont "@"
text_from_ram StringBuffer1
text "!@"
db "@"
; 1c113f
UnknownText_0x1c113f: ; 1c113f
- text $51
- db "The winning score"
+ text ""
+ para "The winning score"
line "was @"
deciram wd004, $23
text " points!"
@@ -1166,8 +1167,8 @@ UnknownText_0x1c1166: ; 1c1166
text "Placing second was"
line "@"
text_from_ram wd016
- text ",", $51
- db "who caught a"
+ text ","
+ para "who caught a"
line "@"
text_from_ram StringBuffer1
text "!@"
@@ -1175,8 +1176,8 @@ UnknownText_0x1c1166: ; 1c1166
; 1c1196
UnknownText_0x1c1196: ; 1c1196
- text $51
- db "The score was"
+ text ""
+ para "The score was"
line "@"
deciram wd008, $23
text " points!"
@@ -1187,8 +1188,8 @@ UnknownText_0x1c11b5: ; 1c11b5
text "Placing third was"
line "@"
text_from_ram wd016
- text ",", $51
- db "who caught a"
+ text ","
+ para "who caught a"
line "@"
text_from_ram StringBuffer1
text "!@"
@@ -1196,8 +1197,8 @@ UnknownText_0x1c11b5: ; 1c11b5
; 1c11e4
UnknownText_0x1c11e4: ; 1c11e4
- text $51
- db "The score was"
+ text ""
+ para "The score was"
line "@"
deciram wd00c, $23
text " points!"
@@ -1216,8 +1217,8 @@ UnknownText_0x1c1203: ; 1c1203
; 1c123a
UnknownText_0x1c123a: ; 1c123a
- text "CURRENT RECORD", $51
- db "@"
+ text "CURRENT RECORD"
+ para "@"
text_from_ram StringBuffer1
text " caught by"
line "@"
@@ -1273,7 +1274,7 @@ UnknownText_0x1c1328: ; 1c1328
; 1c1353
UnknownText_0x1c1353: ; 1c1353
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
; 1c1368
@@ -1334,7 +1335,7 @@ _KrissPCNoRoomDepositText: ; 1c142d
; 1c144d
UnknownText_0x1c144d: ; 1c144d
- text $52, " turned on"
+ text "<PLAYER> turned on"
line "the PC."
prompt
; 1c1462
@@ -1566,19 +1567,21 @@ _OakPCText4: ; 1c19aa
UnknownText_0x1c19cd: ; 1c19cd
text "Triple-theme"
- line "trainer ranking!", $51
- db "The SAVE file you"
- line "just sent might", $55
- db "make the rankings!", $51
- db $57
+ line "trainer ranking!"
+ para "The SAVE file you"
+ line "just sent might"
+ cont "make the rankings!"
+ para ""
+ done
; 1c1a22
UnknownText_0x1c1a22: ; 1c1a22
text "There is no"
- line "ranking data.", $51
- db "Link to obtain"
- line "ranking data.", $51
- db $57
+ line "ranking data."
+ para "Link to obtain"
+ line "ranking data."
+ para ""
+ done
; 1c1a5b
UnknownText_0x1c1a5b: ; 1c1a5b
@@ -1630,7 +1633,7 @@ UnknownText_0x1c1adf: ; 1c1adf
; 1c1b03
UnknownText_0x1c1b03: ; 1c1b03
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
done
@@ -1776,9 +1779,9 @@ _OakText1: ; 1c1d35
_OakText2: ; 1c1da4
text "This world is in-"
- line "habited by crea-", $55
- db "tures that we call", $55
- db "#MON.@"
+ line "habited by crea-"
+ cont "tures that we call"
+ cont "#MON.@"
db "@"
; 1c1de2
diff --git a/text/common_4.asm b/text/common_4.asm
index 1ba35a33d..0278a20b9 100644
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -5,7 +5,7 @@ _OakText6: ; 0x1c4000
; 0x1c4026
_OakText7: ; 0x1c4026
- text $52, ", are you"
+ text "<PLAYER>, are you"
line "ready?"
para "Your very own"
@@ -219,7 +219,7 @@ UnknownText_0x1c456d: ; 0x1c456d
; 0x1c4590
UnknownText_0x1c4590: ; 0x1c4590
- text $52, " saved"
+ text "<PLAYER> saved"
line "the game."
done
; 0x1c45a3
@@ -291,7 +291,7 @@ UnknownText_0x1c4706:: ; 0x1c4706
; 0x1c4719
UnknownText_0x1c4719:: ; 0x1c4719
- text $52, " received"
+ text "<PLAYER> received"
line "@"
text_from_ram StringBuffer4
text "."
@@ -299,7 +299,7 @@ UnknownText_0x1c4719:: ; 0x1c4719
; 0x1c472c
UnknownText_0x1c472c:: ; 0x1c472c
- text $52, " put the"
+ text "<PLAYER> put the"
line "@"
text_from_ram StringBuffer1
text " in"
@@ -366,16 +366,16 @@ UnknownText_0x1c4837: ; 0x1c4837
text ""
line "came from @"
text_from_ram wd02a
- text $55
- db "in a trade?"
+ text ""
+ cont "in a trade?"
para "@"
text_from_ram wd00e
text ""
line "was where @"
text_from_ram wd02a
- text $55
- db "met @"
+ text ""
+ cont "met @"
text_from_ram wd003
text "!"
prompt
@@ -489,8 +489,8 @@ UnknownText_0x1c4ae5: ; 0x1c4ae5
para "I'm sure that"
line "seeing @"
text_from_ram wd003
- text $51
- db "in battle would"
+ text ""
+ para "in battle would"
line "excite anyone."
done
; 0x1c4b92
@@ -507,8 +507,8 @@ UnknownText_0x1c4bae: ; 0x1c4bae
; 0x1c4baf
UnknownText_0x1c4baf: ; 0x1c4baf
- text $51
- db "evolved into"
+ text ""
+ para "evolved into"
line "@"
text_from_ram StringBuffer1
text "!"
@@ -826,12 +826,13 @@ _MobileStadiumEntryText: ; 0x1c50c2
_MobileStadiumSuccessText: ; 0x1c5121
text "Data transfer is"
- line "complete.", $51
- db "We hope you enjoy"
- line "MOBILE STADIUM", $51
- db "battles in the N64"
- line "#MON STADIUM 2.", $51
- db $57
+ line "complete."
+ para "We hope you enjoy"
+ line "MOBILE STADIUM"
+ para "battles in the N64"
+ line "#MON STADIUM 2."
+ para ""
+ done
; 0x1c5182
UnknownText_0x1c5182: ; 0x1c5182
@@ -879,45 +880,49 @@ UnknownText_0x1c521c: ; 0x1c521c
UnknownText_0x1c5238: ; 0x1c5238
text "The CARD FOLDER"
- line "stores your and", $51
- db "your friends'"
- line "CARDS.", $51
- db "A CARD contains"
- line "information like", $51
- db "the person's name,"
- line "phone number and", $55
- db "profile.", $51
- db $57
+ line "stores your and"
+ para "your friends'"
+ line "CARDS."
+ para "A CARD contains"
+ line "information like"
+ para "the person's name,"
+ line "phone number and"
+ cont "profile."
+ para ""
+ done
; 0x1c52bc
UnknownText_0x1c52bc: ; 0x1c52bc
- text "This is your CARD.", $51
- db "Once you've"
- line "entered your phone", $51
- db "number, you can"
- line "trade CARDS with", $55
- db "your friends.", $51
- db $57
+ text "This is your CARD."
+ para "Once you've"
+ line "entered your phone"
+ para "number, you can"
+ line "trade CARDS with"
+ cont "your friends."
+ para ""
+ done
; 0x1c531e
UnknownText_0x1c531e: ; 0x1c531e
text "If you have your"
- line "friend's CARD, you", $51
- db "can use it to make"
- line "a call from a", $51
- db "mobile phone on"
- line "the 2nd floor of a", $55
- db "#MON CENTER.", $51
- db $57
+ line "friend's CARD, you"
+ para "can use it to make"
+ line "a call from a"
+ para "mobile phone on"
+ line "the 2nd floor of a"
+ cont "#MON CENTER."
+ para ""
+ done
; 0x1c5394
UnknownText_0x1c5394: ; 0x1c5394
text "To safely store"
- line "your collection of", $51
- db "CARDS, you must"
- line "set a PASSCODE for", $55
- db "your CARD FOLDER.", $51
- db $57
+ line "your collection of"
+ para "CARDS, you must"
+ line "set a PASSCODE for"
+ cont "your CARD FOLDER."
+ para ""
+ done
; 0x1c53ee
UnknownText_0x1c53ee: ; 0x1c53ee
@@ -945,8 +950,9 @@ UnknownText_0x1c5494: ; 0x1c5494
UnknownText_0x1c54b9: ; 0x1c54b9
text "The CARD FOLDER"
- line "has been deleted.", $51
- db $57
+ line "has been deleted."
+ para ""
+ done
; 0x1c54dd
UnknownText_0x1c54dd: ; 0x1c54dd
@@ -983,7 +989,8 @@ UnknownText_0x1c5580: ; 0x1c5580
; 0x1c5588
UnknownText_0x1c5588: ; 0x1c5588
- text "", $56, $57
+ text $56
+ done
; 0x1c558b
UnknownText_0x1c558b: ; 0x1c558b
@@ -1053,7 +1060,8 @@ UnknownText_0x1c5677: ; 0x1c5677
; 0x1c5678
UnknownText_0x1c5678: ; 0x1c5678
- text "Which move should", $4e, "be forgotten?"
+ text "Which move should"
+ next "be forgotten?"
done
; 0x1c5699
@@ -1110,8 +1118,8 @@ UnknownText_0x1c574d: ; 0x1c574d
UnknownText_0x1c574e: ; 0x1c574e
text " Poof!@"
interpret_data
- text $51
- db "@"
+ text ""
+ para "@"
text_from_ram wd050
text " forgot"
line "@"
@@ -1181,7 +1189,8 @@ UnknownText_0x1c5823: ; 0x1c5823
; 0x1c5824
UnknownText_0x1c5824: ; 0x1c5824
- text "", $56, $57
+ text $56
+ done
; 0x1c5827
UnknownText_0x1c5827: ; 0x1c5827
@@ -1222,20 +1231,23 @@ UnknownText_0x1c58bc: ; 0x1c58bc
; 0x1c58d1
UnknownText_0x1c58d1: ; 0x1c58d1
- text "Here you go!", $51
- db $57
+ text "Here you go!"
+ para ""
+ done
; 0x1c58e0
UnknownText_0x1c58e0: ; 0x1c58e0
text "You don't have"
- line "enough points.", $51
- db $57
+ line "enough points."
+ para ""
+ done
; 0x1c58ff
UnknownText_0x1c58ff: ; 0x1c58ff
text "You have no room"
- line "for it.", $51
- db $57
+ line "for it."
+ para ""
+ done
; 0x1c591a
UnknownText_0x1c591a: ; 0x1c591a
@@ -1245,14 +1257,16 @@ UnknownText_0x1c591a: ; 0x1c591a
; 0x1c5937
UnknownText_0x1c5937: ; 0x1c5937
- text "Excuse me!", $51
- db $57
+ text "Excuse me!"
+ para ""
+ done
; 0x1c5944
UnknownText_0x1c5944: ; 0x1c5944
text "Excuse me."
- line "You're not ready.", $51
- db $57
+ line "You're not ready."
+ para ""
+ done
; 0x1c5962
UnknownText_0x1c5962: ; 0x1c5962
@@ -1263,44 +1277,50 @@ UnknownText_0x1c5962: ; 0x1c5962
UnknownText_0x1c5983: ; 0x1c5983
text "You need at least"
- line "three #MON.", $51
- db $57
+ line "three #MON."
+ para ""
+ done
; 0x1c59a3
UnknownText_0x1c59a3: ; 0x1c59a3
text "Sorry, an EGG"
- line "doesn't qualify.", $51
- db $57
+ line "doesn't qualify."
+ para ""
+ done
; 0x1c59c3
UnknownText_0x1c59c3: ; 0x1c59c3
text "Only three #MON"
- line "may be entered.", $51
- db $57
+ line "may be entered."
+ para ""
+ done
; 0x1c59e5
UnknownText_0x1c59e5: ; 0x1c59e5
text "The @"
text_from_ram StringBuffer2
text " #MON"
- line "must all be", $55
- db "different kinds.", $51
- db $57
+ line "must all be"
+ cont "different kinds."
+ para ""
+ done
; 0x1c5a13
UnknownText_0x1c5a13: ; 0x1c5a13
text "The @"
text_from_ram StringBuffer2
text " #MON"
- line "must not hold the", $55
- db "same items.", $51
- db $57
+ line "must not hold the"
+ cont "same items."
+ para ""
+ done
; 0x1c5a42
UnknownText_0x1c5a42: ; 0x1c5a42
text "You can't take an"
- line "EGG!", $51
- db $57
+ line "EGG!"
+ para ""
+ done
; 0x1c5a5a
UnknownText_0x1c5a5a: ; 0x1c5a5a
@@ -1374,8 +1394,8 @@ UnknownText_0x1c5b38: ; 0x1c5b38
UnknownText_0x1c5b53: ; 0x1c5b53
text_from_ram EnemyMonNick
text "'s data"
- line "was newly added to", $55
- db "the #DEX.@"
+ line "was newly added to"
+ cont "the #DEX.@"
sound0x2C
text_waitbutton
db "@"
@@ -1431,7 +1451,7 @@ UnknownText_0x1c5c28: ; 0x1c5c28
; 0x1c5c44
UnknownText_0x1c5c44: ; 0x1c5c44
- text $52, " played the"
+ text "<PLAYER> played the"
line "# FLUTE.@"
text_waitbutton
db "@"
@@ -1495,8 +1515,8 @@ UnknownText_0x1c5d03: ; 0x1c5d03
text "There was a trophy"
line "inside!@"
sound0
- text $51
- db "@"
+ text ""
+ para "@"
text_from_ram PlayerName
text " sent the"
line "trophy home."
@@ -1515,7 +1535,7 @@ UnknownText_0x1c5d50: ; 0x1c5d50
; 0x1c5d6e
UnknownText_0x1c5d6e: ; 0x1c5d6e
- text "OAK: ", $52, "!"
+ text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
prompt
@@ -1566,7 +1586,7 @@ UnknownText_0x1c5e3a: ; 0x1c5e3a
; 0x1c5e68
UnknownText_0x1c5e68: ; 0x1c5e68
- text $52, " used the@"
+ text "<PLAYER> used the@"
text_dunno1
text_from_ram StringBuffer2
text "."
@@ -1574,7 +1594,7 @@ UnknownText_0x1c5e68: ; 0x1c5e68
; 0x1c5e7b
UnknownText_0x1c5e7b: ; 0x1c5e7b
- text $52, " got on the@"
+ text "<PLAYER> got on the@"
text_dunno1
text_from_ram StringBuffer2
text "."
@@ -1582,7 +1602,7 @@ UnknownText_0x1c5e7b: ; 0x1c5e7b
; 0x1c5e90
UnknownText_0x1c5e90: ; 0x1c5e90
- text $52, " got off@"
+ text "<PLAYER> got off@"
text_dunno1
text "the @"
text_from_ram StringBuffer2
diff --git a/text/phone/beverly_overworld.asm b/text/phone/beverly_overworld.asm
index ec0add3ec..cd4b5b4d3 100644
--- a/text/phone/beverly_overworld.asm
+++ b/text/phone/beverly_overworld.asm
@@ -44,7 +44,7 @@ BeverlyPhoneFullText:
done
BeverlyGiftText:
- text "Oh? ", $52, "? "
+ text "Oh? <PLAYER>? "
line "I waited here for"
para "you. I brought you"
diff --git a/text/phone/bill.asm b/text/phone/bill.asm
index 6705d35d4..293188909 100644
--- a/text/phone/bill.asm
+++ b/text/phone/bill.asm
@@ -29,21 +29,24 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
done
BillPhoneGeneriText: ; 0x1b44fe
- db $0, "Who's calling?", $51
- db $14, ", is it?", $4f
- db "Hang on a sec…", $51
- db $56, $4f
- db $56, $57
+ text "Who's calling?"
+
+ para "<PLAY_G>, is it?"
+ line "Hang on a sec…"
+
+ para $56
+ line $56
+ done
BillPhoneNotFullText: ; 0x1b452a
text "Thanks for"
line "waiting!"
- para $14, ", your BOX"
+ para "<PLAY_G>, your BOX"
line "has room for @"
TX_RAM StringBuffer3
- text $55
- db "more #MON."
+ text ""
+ cont "more #MON."
para "Get out there and"
line "fill it up!"
@@ -53,7 +56,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
text "Thanks for"
line "waiting!"
- para $14, ", your BOX"
+ para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
TX_RAM StringBuffer3
@@ -67,7 +70,7 @@ BillPhoneFullText: ; 0x1b45ed
text "Thanks for"
line "waiting!"
- para $14, ", your BOX"
+ para "<PLAY_G>, your BOX"
line "is full!"
para "You'll have to"
@@ -78,7 +81,7 @@ BillPhoneFullText: ; 0x1b45ed
done
BillPhoneNewlyFullText: ; 0x1b4652
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
line "It's me, BILL!"
para "Thanks for using"
diff --git a/text/phone/buena.asm b/text/phone/buena.asm
index 1f1020703..d3390a74c 100644
--- a/text/phone/buena.asm
+++ b/text/phone/buena.asm
@@ -2,7 +2,7 @@ UnknownText_0xa0c28: ; 0xa0c28
text "Hi, this is BUENA…"
para "Oh! Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "I'm kind of foggy"
line "in the morning…"
@@ -11,7 +11,7 @@ UnknownText_0xa0c28: ; 0xa0c28
UnknownText_0xa0c72: ; 0xa0c72
text "Hi, this is BUENA…"
- line "Oh! Hi, ", $14, "!"
+ line "Oh! Hi, <PLAY_G>!"
para "Do you tune into"
line "BUENA's show?"
@@ -38,7 +38,7 @@ UnknownText_0xa0caf: ; 0xa0caf
UnknownText_0xa0d42: ; 0xa0d42
text "Hi, this is BUENA…"
- line "Oh! Hi, ", $14, "!"
+ line "Oh! Hi, <PLAY_G>!"
para "I just got off"
line "work. "
@@ -49,7 +49,7 @@ UnknownText_0xa0d42: ; 0xa0d42
; 0xa0d96
UnknownText_0xa0d96: ; 0xa0d96
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I got up early, so"
@@ -58,7 +58,7 @@ UnknownText_0xa0d96: ; 0xa0d96
; 0xa0dcf
UnknownText_0xa0dcf: ; 0xa0dcf
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I needed someone"
@@ -67,7 +67,7 @@ UnknownText_0xa0dcf: ; 0xa0dcf
; 0xa0e01
UnknownText_0xa0e01: ; 0xa0e01
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I'm just on my"
@@ -76,7 +76,7 @@ UnknownText_0xa0e01: ; 0xa0e01
; 0xa0e29
UnknownText_0xa0e29: ; 0xa0e29
- text $14, "!"
+ text "<PLAY_G>!"
line "Hi, it's BUENA!"
para "I couldn't sleep,"
@@ -85,7 +85,7 @@ UnknownText_0xa0e29: ; 0xa0e29
; 0xa0e5e
UnknownText_0xa0e5e: ; 0xa0e5e
- text "Oh. Hi, ", $14, "!"
+ text "Oh. Hi, <PLAY_G>!"
para "You are how?"
@@ -98,7 +98,7 @@ UnknownText_0xa0e5e: ; 0xa0e5e
para "The RADIO TOWER is"
line "in deep trouble!"
- para $14, ", you'd"
+ para "<PLAY_G>, you'd"
line "better be careful!"
done
; 0xa0efb
@@ -152,7 +152,7 @@ UnknownText_0xa0fcf: ; 0xa0fcf
; 0xa109d
UnknownText_0xa109d: ; 0xa109d
- text "Tell me, ", $14, "."
+ text "Tell me, <PLAY_G>."
line "Have you ever won"
para "a prize on the"
@@ -245,7 +245,7 @@ UnknownText_0xa1318: ; 0xa1318
; 0xa13d8
UnknownText_0xa13d8: ; 0xa13d8
- text "Hey, ", $14, "."
+ text "Hey, <PLAY_G>."
line "You won that RADIO"
para "CARD by beating"
@@ -334,7 +334,7 @@ UnknownText_0xa15de: ; 0xa15de
; 0xa1717
UnknownText_0xa1717: ; 0xa1717
- text $14, ", tell me."
+ text "<PLAY_G>, tell me."
para "When do you relax"
line "the most?"
@@ -367,7 +367,7 @@ UnknownText_0xa1717: ; 0xa1717
; 0xa183d
UnknownText_0xa183d: ; 0xa183d
- text $14, ", what was"
+ text "<PLAY_G>, what was"
line "the first #MON"
cont "you ever caught?"
@@ -426,7 +426,7 @@ UnknownText_0xa19b1: ; 0xa19b1
para "I'd much rather go"
line "to the beach!"
- para $14, ", I hope"
+ para "<PLAY_G>, I hope"
line "you have enough"
para "fun for both of us"
@@ -478,7 +478,7 @@ UnknownText_0xa1bed: ; 0xa1bed
para "STORE has a sale"
line "on when we go…"
- para $14, ", maybe we"
+ para "<PLAY_G>, maybe we"
line "can hook up too!"
para "Catch you later!"
@@ -509,7 +509,7 @@ UnknownText_0xa1c88: ; 0xa1c88
; 0xa1d5f
UnknownText_0xa1d5f: ; 0xa1d5f
- text "Hey, ", $14, ". You"
+ text "Hey, <PLAY_G>. You"
line "use your #GEAR"
para "to listen to the"
diff --git a/text/phone/elm.asm b/text/phone/elm.asm
index d6823777d..cea36061f 100644
--- a/text/phone/elm.asm
+++ b/text/phone/elm.asm
@@ -1,5 +1,5 @@
ElmPhoneStartText: ; 0x1b46fc
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Try not to overdo"
line "it."
@@ -10,7 +10,7 @@ ElmPhoneStartText: ; 0x1b46fc
done
ElmPhoneSawMrPokemonText: ; 0x1b4749
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Did you meet MR."
line "#MON? Great!"
@@ -18,7 +18,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
done
ElmPhonePokemonStolenText: ; 0x1b4784
- text $14, "? I'm very"
+ text "<PLAY_G>? I'm very"
line "upset now."
para "We had a #MON"
@@ -29,7 +29,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
done
ElmPhoneCheckingEggText: ; 0x1b47d5
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "We're checking the"
line "EGG now. It does"
@@ -39,7 +39,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
done
ElmPhoneAssistantText: ; 0x1b481c
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "Did you see my"
line "assistant? He's at"
@@ -49,7 +49,7 @@ ElmPhoneAssistantText: ; 0x1b481c
done
ElmPhoneEggUnhatchedText: ; 0x1b4868
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "How's the EGG? Has"
line "anything changed?"
@@ -59,7 +59,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
done
ElmPhoneEggHatchedText: ; 0x1b48bb
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
line "How is the EGG?"
para "What? It hatched?"
@@ -71,7 +71,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
done
ElmPhoneDiscovery1Text: ; 0x1b491f
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I just made a new"
line "discovery."
@@ -84,7 +84,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
done
ElmPhoneDiscovery2Text: ; 0x1b4982
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "It's still a"
line "mystery what kinds"
@@ -97,7 +97,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
done
ElmPhonePokerusText: ; 0x1b49e7
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I discovered an"
line "odd thing."
@@ -130,7 +130,7 @@ ElmPhonePokerusText: ; 0x1b49e7
done
ElmPhoneDisasterText: ; 0x1b4b17
- text "H-hello? ", $14, "?"
+ text "H-hello? <PLAY_G>?"
line "It's a disaster!"
para "Uh, um, it's just"
@@ -144,7 +144,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
done
ElmPhoneEggAssistantText: ; 0x1b4b87
- text "Hello, ", $14, "? We"
+ text "Hello, <PLAY_G>? We"
line "discovered some-"
para "thing about the"
@@ -159,7 +159,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
done
ElmPhoneRocketText: ; 0x1b4c06
- text $14, ", how are"
+ text "<PLAY_G>, how are"
line "things going?"
para "I called because"
@@ -171,7 +171,7 @@ ElmPhoneRocketText: ; 0x1b4c06
para "They were talking"
line "about TEAM ROCKET."
- para $14, ", do you"
+ para "<PLAY_G>, do you"
line "know anything"
cont "about it?"
@@ -186,7 +186,7 @@ ElmPhoneRocketText: ; 0x1b4c06
done
ElmPhoneGiftText: ; 0x1b4d09
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
para "I have something"
line "here for you."
@@ -198,7 +198,7 @@ ElmPhoneGiftText: ; 0x1b4d09
done
ElmPhoneUnusedText: ; 0x1b4d5d
- text "Hello, ", $14, "?"
+ text "Hello, <PLAY_G>?"
line "How's it going?"
para "I got ahold of"
diff --git a/text/phone/extra.asm b/text/phone/extra.asm
index 4ec789f49..7953bee78 100644
--- a/text/phone/extra.asm
+++ b/text/phone/extra.asm
@@ -8,7 +8,7 @@ UnknownText_0x64000: ; 0x64000
; 0x64032
UnknownText_0x64032: ; 0x64032
- text $14, ", have you"
+ text "<PLAY_G>, have you"
line "heard?"
para "GOLDENROD's RADIO"
@@ -23,7 +23,7 @@ UnknownText_0x64032: ; 0x64032
; 0x64099
UnknownText_0x64099: ; 0x64099
- text $14, ", I heard!"
+ text "<PLAY_G>, I heard!"
para "You defeated that"
line "WHITNEY?"
@@ -43,7 +43,7 @@ UnknownText_0x640e6: ; 0x640e6
para "LIGHTHOUSE, didn't"
line "you?"
- para $14, ", I wish"
+ para "<PLAY_G>, I wish"
line "you'd come see me"
para "when I'm sick in"
@@ -100,7 +100,7 @@ UnknownText_0x642bb: ; 0x642bb
line "lady who looked a"
para "lot like you,"
- line $14, "."
+ line "<PLAY_G>."
para "What? That lady"
line "was your mom?"
@@ -127,7 +127,7 @@ UnknownText_0x643d4: ; 0x643d4
line "I saw!"
para "You striding onto"
- line "a ship, ", $14, "!"
+ line "a ship, <PLAY_G>!"
para "I can't get over"
line "how good you look"
@@ -192,7 +192,7 @@ UnknownText_0x645ff: ; 0x645ff
cont "the place."
para "It just makes me"
- line "sigh, ", $14, "."
+ line "sigh, <PLAY_G>."
para "How did you get so"
line "strong?"
@@ -241,7 +241,7 @@ UnknownText_0x646df: ; 0x646df
; 0x647d8
UnknownText_0x647d8: ; 0x647d8
- text $14, ", I heard!"
+ text "<PLAY_G>, I heard!"
para "You're kicking up"
line "a mighty ruckus"
@@ -491,7 +491,7 @@ UnknownText_0x64e2f: ; 0x64e2f
para "to @"
text_from_ram StringBuffer5
- db $0
+ text ""
line "and pick it up?"
done
; 0x64e90
@@ -561,8 +561,8 @@ UnknownText_0x6501c: ; 0x6501c
text "You know what?"
line "A wild @"
text_from_ram StringBuffer4
- text $51
- db "got away from me"
+ text ""
+ para "got away from me"
line "again."
para "It was so close!"
@@ -918,8 +918,8 @@ UnknownText_0x65ab2: ; 0x65ab2
text "Listen to this."
line "My @"
text_from_ram StringBuffer4
- text $51
- db "grins happily when"
+ text ""
+ para "grins happily when"
line "I pinch its cheek."
para "But it never grins"
@@ -1121,7 +1121,7 @@ UnknownText_0x65ff2: ; 0x65ff2
UnknownText_0x66043: ; 0x66043
text "Yup, TULLY here…"
- para $14, "? What?"
+ para "<PLAY_G>? What?"
line "You're lost?"
para "Our battle will be"
@@ -1401,7 +1401,7 @@ UnknownText_0x66796: ; 0x66796
para "It's awful."
line "My CLEFAIRY…"
- para "Huh? ", $14, "?"
+ para "Huh? <PLAY_G>?"
para "Oh, sorry! I was"
line "in a hurry, and I…"
@@ -1497,8 +1497,8 @@ UnknownText_0x669ed: ; 0x669ed
text "But get this, a"
line "wild @"
text_from_ram StringBuffer4
- text $51
- db "just barely eluded"
+ text ""
+ para "just barely eluded"
line "us."
para "I wanted to FLY"
@@ -1533,7 +1533,7 @@ UnknownText_0x66aa5: ; 0x66aa5
; 0x66ad1
UnknownText_0x66ad1: ; 0x66ad1
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "Hurry, hurry!"
para "@"
@@ -1808,7 +1808,7 @@ UnknownText_0x6717a: ; 0x6717a
text_from_ram StringBuffer3
text "'s @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "is much stronger"
cont "than before!"
done
@@ -1831,7 +1831,7 @@ UnknownText_0x671eb: ; 0x671eb
para "A wild @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "got away from me"
para "again. It's just"
@@ -1869,7 +1869,7 @@ UnknownText_0x67294: ; 0x67294
; 0x672d5
UnknownText_0x672d5: ; 0x672d5
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "Come battle ERIN!"
para "I'll be waiting on"
diff --git a/text/phone/extra3.asm b/text/phone/extra3.asm
index bc154f84f..443338465 100644
--- a/text/phone/extra3.asm
+++ b/text/phone/extra3.asm
@@ -1,5 +1,5 @@
UnknownText_0x174000: ; 0x174000
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
line "Our BICYCLE sales"
para "have gone through"
@@ -216,7 +216,7 @@ UnknownText_0x1745c2: ; 0x1745c2
; 0x174638
UnknownText_0x174638: ; 0x174638
- text "Hey, ", $14, "!"
+ text "Hey, <PLAY_G>!"
para "Do you remember"
line "your promise?"
@@ -316,7 +316,7 @@ UnknownText_0x174895: ; 0x174895
para "in @"
text_from_ram StringBuffer5
- db $0
+ text ""
line "when you can."
done
; 0x1748ea
@@ -372,7 +372,7 @@ UnknownText_0x1749c7: ; 0x1749c7
UnknownText_0x174a24: ; 0x174a24
text "My @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "might be greater"
cont "than I imagined."
@@ -452,7 +452,7 @@ UnknownText_0x174c29: ; 0x174c29
; 0x174c49
UnknownText_0x174c49: ; 0x174c49
- text $14, ", why"
+ text "<PLAY_G>, why"
line "aren't you here?"
para "I'll take you down"
@@ -485,8 +485,8 @@ UnknownText_0x174cf6: ; 0x174cf6
text "Oh, have you ever"
line "seen a @"
text_from_ram StringBuffer4
- text $55
- db "before?"
+ text ""
+ cont "before?"
para "I just battled"
line "one…"
@@ -553,7 +553,7 @@ UnknownText_0x174ec5: ; 0x174ec5
; 0x174ee2
UnknownText_0x174ee2: ; 0x174ee2
- text "Um… ", $14, "?"
+ text "Um… <PLAY_G>?"
line "What's wrong?"
para "Did you forget our"
@@ -671,7 +671,7 @@ UnknownText_0x17519b: ; 0x17519b
; 0x17520a
UnknownText_0x17520a: ; 0x17520a
- text $14, ", could you"
+ text "<PLAY_G>, could you"
line "hurry over?"
para "FARFETCH'D is"
@@ -823,8 +823,8 @@ UnknownText_0x175591: ; 0x175591
text "Oh yeah, I took"
line "down a @"
text_from_ram StringBuffer4
- text $51
- db "in the wild the"
+ text ""
+ para "in the wild the"
line "other day."
para "It was a cakewalk."
@@ -891,7 +891,7 @@ UnknownText_0x17571d: ; 0x17571d
UnknownText_0x175786: ; 0x175786
text "What's keeping"
- line "you, ", $52, "!"
+ line "you, <PLAYER>!"
para "Let's get down and"
line "battle already!"
@@ -927,8 +927,8 @@ UnknownText_0x175869: ; 0x175869
text "Oh yeah, we KO'd a"
line "wild @"
text_from_ram StringBuffer4
- text $51
- db "with one hit a"
+ text ""
+ para "with one hit a"
line "while back."
para "It went down so"
@@ -989,7 +989,7 @@ UnknownText_0x1759f7: ; 0x1759f7
line "today."
para "Are you going,"
- line $14, "?"
+ line "<PLAY_G>?"
para "I'm trying to make"
line "up my mind."
@@ -1146,7 +1146,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "Heh, they're some"
line "kind of feisty!"
- para $14, ", you have"
+ para "<PLAY_G>, you have"
line "to see this rare"
para "sight! Get ready"
@@ -1549,7 +1549,7 @@ UnknownText_0x176aef: ; 0x176aef
para "wild @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "quite often."
para "They're easily"
@@ -1599,27 +1599,27 @@ UnknownText_0x176c47: ; 0x176c47
; 0x176c61
UnknownText_0x176c61: ; 0x176c61
- text $52, "! It's"
+ text "<PLAYER>! It's"
line "mind-blowing!"
para "I took a hike in"
line "@"
text_from_ram StringBuffer5
- text $55
- db "yesterday, see?"
+ text ""
+ cont "yesterday, see?"
para "Well, there were"
line "tons of @"
text_from_ram StringBuffer4
- text $51
- db "around! You have"
+ text ""
+ para "around! You have"
line "to see it!"
para "I get this feeling"
line "that @"
text_from_ram StringBuffer4
- text $51
- db "may be timid."
+ text ""
+ para "may be timid."
line "I didn't see any"
para "where there are"
@@ -1899,7 +1899,7 @@ UnknownText_0x177465: ; 0x177465
; 0x1774c1
UnknownText_0x1774c1: ; 0x1774c1
- text "Oh, ", $14, "!"
+ text "Oh, <PLAY_G>!"
line "How soon can I"
para "expect to see you"
diff --git a/text/phone/huey_overworld.asm b/text/phone/huey_overworld.asm
index e063c4e2b..4629f8022 100644
--- a/text/phone/huey_overworld.asm
+++ b/text/phone/huey_overworld.asm
@@ -57,7 +57,7 @@ HueyRematchGiftText:
para "I've battled you"
line "over and over, but"
- para $52, ", I haven't"
+ para "<PLAYER>, I haven't"
line "won once."
para "I bought tons of"
@@ -73,7 +73,7 @@ HueyRematchGiftText:
line "it is…"
para "Here, take this,"
- line $52, "."
+ line "<PLAYER>."
para "I won't be needing"
line "it anymore…"
diff --git a/text/phone/jose_overworld.asm b/text/phone/jose_overworld.asm
index a2a163e8e..05e50172c 100644
--- a/text/phone/jose_overworld.asm
+++ b/text/phone/jose_overworld.asm
@@ -1,7 +1,7 @@
JoseAskNumber1Text:
text "If my @"
text_from_ram StringBuffer4
- db $0
+ text ""
line "sees anything"
para "pretty, it goes"
diff --git a/text/phone/kenji_overworld.asm b/text/phone/kenji_overworld.asm
index 32bc968ba..a3206b946 100644
--- a/text/phone/kenji_overworld.asm
+++ b/text/phone/kenji_overworld.asm
@@ -43,7 +43,7 @@ KenjiPhoneFullText:
KenjiGiftText:
text "I wish to thank"
- line "you, ", $52, "!"
+ line "you, <PLAYER>!"
para "I've been training"
line "all alone…"
diff --git a/text/phone/mom.asm b/text/phone/mom.asm
index 2ed4bee15..f94ef388a 100644
--- a/text/phone/mom.asm
+++ b/text/phone/mom.asm
@@ -1,7 +1,7 @@
MomPhoneGreetingText: ; 0x1b4000
text "Hello?"
- para "Oh, hi, ", $52, "!"
+ para "Oh, hi, <PLAYER>!"
line "Working hard?"
done
@@ -14,8 +14,8 @@ UnknownText_0x1b4021: ; 0x1b4021
para "Isn't that where"
line "@"
TX_RAM StringBuffer4
- text $51
- db "is? Did you go"
+ text ""
+ para "is? Did you go"
line "take a look?"
done
@@ -27,7 +27,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
para "I've never gone"
line "there. That's kind"
- cont "of neat, ", $52, "."
+ cont "of neat, <PLAYER>."
done
MomPhoneNewBarkText: ; 0x1b40b1
@@ -64,7 +64,7 @@ UnknownText_0x1b4150: ; 0x1b4150
text "That sounds really"
line "tough."
- para "But, ", $52, ", I"
+ para "But, <PLAYER>, I"
line "know you're really"
para "determined. You'll"
@@ -87,7 +87,7 @@ UnknownText_0x1b41ea: ; 0x1b41ea
done
UnknownText_0x1b420d: ; 0x1b420d
- text "Oh, ", $52, ","
+ text "Oh, <PLAYER>,"
line "you're not saving"
para "any money. Would"
@@ -115,7 +115,7 @@ MomPhoneWontSaveMoneyText: ; 0x1b42a3
done
MomPhoneHangUpText: ; 0x1b42c0
- text $52, ", keep it"
+ text "<PLAYER>, keep it"
line "up! I'm rooting"
cont "for you, baby!"
done
@@ -123,7 +123,7 @@ MomPhoneHangUpText: ; 0x1b42c0
MomPhoneNoPokemonText: ; 0x1b42ea
text "Hello?"
- para "Oh, hi, ", $52, "!"
+ para "Oh, hi, <PLAYER>!"
line "Wasn't PROF.ELM"
cont "waiting for you?"
done
@@ -131,7 +131,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
MomPhoneNoPokedexText: ; 0x1b431d
text "Hello?"
- para "Oh, hi, ", $52, "!"
+ para "Oh, hi, <PLAYER>!"
line "You're on a big"
para "mission for PROF."
@@ -141,7 +141,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
MomPhoneNoGymQuestText: ; 0x1b435f
text "Hello?"
- para "Hi, ", $52, "! If"
+ para "Hi, <PLAYER>! If"
line "you're done with"
para "your errand come"
@@ -151,7 +151,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
MomPhoneLectureText: ; 0x1b43a1
text "Hello?"
- para "…… ", $52, "?"
+ para "…… <PLAYER>?"
line "I heard from PROF."
para "ELM that you went"
diff --git a/text/phone/trainers1.asm b/text/phone/trainers1.asm
index c40d5c97f..09747c44d 100644
--- a/text/phone/trainers1.asm
+++ b/text/phone/trainers1.asm
@@ -5,7 +5,7 @@ UnknownText_0x1b4dc5: ; 0x1b4dc5
text "…"
para "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b4ded: ; 0x1b4ded
@@ -15,7 +15,7 @@ UnknownText_0x1b4ded: ; 0x1b4ded
text "…"
para "How's it going,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b4e16: ; 0x1b4e16
@@ -25,11 +25,11 @@ UnknownText_0x1b4e16: ; 0x1b4e16
text "…"
para "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b4e3e: ; 0x1b4e3e
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -39,7 +39,7 @@ UnknownText_0x1b4e3e: ; 0x1b4e3e
done
UnknownText_0x1b4e72: ; 0x1b4e72
- text $14, ", howdy!"
+ text "<PLAY_G>, howdy!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -48,7 +48,7 @@ UnknownText_0x1b4e72: ; 0x1b4e72
done
UnknownText_0x1b4e9e: ; 0x1b4e9e
- text $14, ", good"
+ text "<PLAY_G>, good"
line "evening!"
para "It's me, @"
@@ -77,7 +77,7 @@ UnknownText_0x1b4f21: ; 0x1b4f21
text "."
para "Oh! Good morning,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4f4d: ; 0x1b4f4d
@@ -87,7 +87,7 @@ UnknownText_0x1b4f4d: ; 0x1b4f4d
text "."
para "Oh! Good day,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4f75: ; 0x1b4f75
@@ -97,11 +97,11 @@ UnknownText_0x1b4f75: ; 0x1b4f75
text "."
para "Oh! Good evening,"
- line $52, "."
+ line "<PLAYER>."
done
UnknownText_0x1b4fa1: ; 0x1b4fa1
- text "Hello, ", $52, "."
+ text "Hello, <PLAYER>."
line "Good morning."
para "This is @"
@@ -111,7 +111,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1
done
UnknownText_0x1b4fda: ; 0x1b4fda
- text "Hi, ", $52, "."
+ text "Hi, <PLAYER>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -120,7 +120,7 @@ UnknownText_0x1b4fda: ; 0x1b4fda
done
UnknownText_0x1b5004: ; 0x1b5004
- text "Hi, ", $52, "."
+ text "Hi, <PLAYER>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -146,7 +146,7 @@ UnknownText_0x1b5073: ; 0x1b5073
text "."
para "Huh? What's up,"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b509b: ; 0x1b509b
@@ -156,7 +156,7 @@ UnknownText_0x1b509b: ; 0x1b509b
text "."
para "Huh? What's up"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b50c2: ; 0x1b50c2
@@ -166,11 +166,11 @@ UnknownText_0x1b50c2: ; 0x1b50c2
text "."
para "Huh? What's up"
- line $52, "?"
+ line "<PLAYER>?"
done
UnknownText_0x1b50e9: ; 0x1b50e9
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "You awake?"
para "It's me, @"
@@ -180,7 +180,7 @@ UnknownText_0x1b50e9: ; 0x1b50e9
done
UnknownText_0x1b511a: ; 0x1b511a
- text "Yo, ", $52, "! You"
+ text "Yo, <PLAYER>! You"
line "free right now?"
para "It's me, @"
@@ -190,7 +190,7 @@ UnknownText_0x1b511a: ; 0x1b511a
done
UnknownText_0x1b5154: ; 0x1b5154
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "Were you asleep?"
para "It's me, @"
@@ -236,7 +236,7 @@ UnknownText_0x1b5270: ; 0x1b5270
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -246,7 +246,7 @@ UnknownText_0x1b52a5: ; 0x1b52a5
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
done
UnknownText_0x1b52cc: ; 0x1b52cc
@@ -255,12 +255,12 @@ UnknownText_0x1b52cc: ; 0x1b52cc
TX_RAM StringBuffer3
text " speaking…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b5301: ; 0x1b5301
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -270,7 +270,7 @@ UnknownText_0x1b5301: ; 0x1b5301
done
UnknownText_0x1b5335: ; 0x1b5335
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -279,7 +279,7 @@ UnknownText_0x1b5335: ; 0x1b5335
done
UnknownText_0x1b535f: ; 0x1b535f
- text $14, ", good"
+ text "<PLAY_G>, good"
line "evening!"
para "It's me, @"
@@ -304,13 +304,14 @@ UnknownText_0x1b5393: ; 0x1b5393
done
UnknownText_0x1b53f7: ; 0x1b53f7
- db $0, "Hello, this is", $4f
- db "@"
+ text "Hello, this is"
+ line "@"
TX_RAM StringBuffer3
- db $0, ".", $51
- db "Oh, ", $14, ".", $4f
- db "Good morning.", $51
- db $57
+ text "."
+ para "Oh, <PLAY_G>."
+ line "Good morning."
+ para ""
+ done
UnknownText_0x1b5424: ; 0x1b5424
text "Hello, this is"
@@ -318,7 +319,7 @@ UnknownText_0x1b5424: ; 0x1b5424
TX_RAM StringBuffer3
text "."
- para "Oh. Hi, ", $14, "."
+ para "Oh. Hi, <PLAY_G>."
done
UnknownText_0x1b5446: ; 0x1b5446
@@ -327,13 +328,13 @@ UnknownText_0x1b5446: ; 0x1b5446
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good evening."
done
UnknownText_0x1b5472: ; 0x1b5472
text "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "This is @"
TX_RAM StringBuffer3
@@ -342,7 +343,7 @@ UnknownText_0x1b5472: ; 0x1b5472
done
UnknownText_0x1b54a6: ; 0x1b54a6
- text $14, ", hi!"
+ text "<PLAY_G>, hi!"
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -352,7 +353,7 @@ UnknownText_0x1b54a6: ; 0x1b54a6
done
UnknownText_0x1b54d4: ; 0x1b54d4
- text "Hi, ", $14, "."
+ text "Hi, <PLAY_G>."
line "Good evening."
para "This is @"
@@ -386,7 +387,7 @@ UnknownText_0x1b55ae: ; 0x1b55ae
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "?"
+ para "Oh, <PLAY_G>?"
line "Good morning!"
done
@@ -396,7 +397,7 @@ UnknownText_0x1b55da: ; 0x1b55da
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "? Hi!"
+ para "Oh, <PLAY_G>? Hi!"
done
UnknownText_0x1b55fc: ; 0x1b55fc
@@ -405,12 +406,12 @@ UnknownText_0x1b55fc: ; 0x1b55fc
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "?"
+ para "Oh, <PLAY_G>?"
line "Good evening!"
done
UnknownText_0x1b5628: ; 0x1b5628
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -419,7 +420,7 @@ UnknownText_0x1b5628: ; 0x1b5628
done
UnknownText_0x1b564c: ; 0x1b564c
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -428,7 +429,7 @@ UnknownText_0x1b564c: ; 0x1b564c
done
UnknownText_0x1b5670: ; 0x1b5670
- text "Oh, ", $14, "?"
+ text "Oh, <PLAY_G>?"
para "Tweet! Yeah, it's"
line "me, @"
@@ -456,7 +457,7 @@ UnknownText_0x1b5702: ; 0x1b5702
TX_RAM StringBuffer3
text "…"
- para "Oh. Hi, ", $52, "."
+ para "Oh. Hi, <PLAYER>."
line "What's up?"
done
@@ -466,7 +467,7 @@ UnknownText_0x1b572e: ; 0x1b572e
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $52, ","
+ para "Oh, hi, <PLAYER>,"
line "what's up?"
done
@@ -476,7 +477,7 @@ UnknownText_0x1b575a: ; 0x1b575a
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $52, ","
+ para "Oh, hi, <PLAYER>,"
line "what's up?"
done
@@ -528,7 +529,7 @@ UnknownText_0x1b589a: ; 0x1b589a
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
@@ -537,7 +538,7 @@ UnknownText_0x1b58c2: ; 0x1b58c2
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
@@ -546,12 +547,12 @@ UnknownText_0x1b58ea: ; 0x1b58ea
TX_RAM StringBuffer3
text " here!"
- para "Oh, ", $52, "? You"
+ para "Oh, <PLAYER>? You"
line "doing well?"
done
UnknownText_0x1b5912: ; 0x1b5912
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "How're you doing?"
para "This is @"
@@ -561,7 +562,7 @@ UnknownText_0x1b5912: ; 0x1b5912
done
UnknownText_0x1b5948: ; 0x1b5948
- text "Yo, ", $52, "! How's"
+ text "Yo, <PLAYER>! How's"
line "it going?"
para "This is @"
@@ -571,7 +572,7 @@ UnknownText_0x1b5948: ; 0x1b5948
done
UnknownText_0x1b597c: ; 0x1b597c
- text "Yo, ", $52, "!"
+ text "Yo, <PLAYER>!"
line "How're you doing?"
para "This is @"
@@ -603,7 +604,7 @@ UnknownText_0x1b5a3b: ; 0x1b5a3b
TX_RAM StringBuffer3
text " speaking."
- para "Oh. Hi, ", $14, "!"
+ para "Oh. Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -613,7 +614,7 @@ UnknownText_0x1b5a74: ; 0x1b5a74
TX_RAM StringBuffer3
text " speaking."
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
done
UnknownText_0x1b5a9f: ; 0x1b5a9f
@@ -622,12 +623,12 @@ UnknownText_0x1b5a9f: ; 0x1b5a9f
TX_RAM StringBuffer3
text " speaking."
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b5ad8: ; 0x1b5ad8
- text $14, ", good"
+ text "<PLAY_G>, good"
line "morning!"
para "It's me, @"
@@ -637,7 +638,7 @@ UnknownText_0x1b5ad8: ; 0x1b5ad8
done
UnknownText_0x1b5b0b: ; 0x1b5b0b
- text $14, ", howdy!"
+ text "<PLAY_G>, howdy!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -647,7 +648,7 @@ UnknownText_0x1b5b0b: ; 0x1b5b0b
UnknownText_0x1b5b37: ; 0x1b5b37
text "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's me, @"
TX_RAM StringBuffer3
@@ -676,7 +677,7 @@ UnknownText_0x1b5b68: ; 0x1b5b68
done
UnknownText_0x1b5c10: ; 0x1b5c10
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -686,7 +687,7 @@ UnknownText_0x1b5c10: ; 0x1b5c10
done
UnknownText_0x1b5c63: ; 0x1b5c63
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -696,7 +697,7 @@ UnknownText_0x1b5c63: ; 0x1b5c63
done
UnknownText_0x1b5cb6: ; 0x1b5cb6
- text "Yes? Ah, ", $14, "."
+ text "Yes? Ah, <PLAY_G>."
para "You're courteous"
line "enough to state"
@@ -738,36 +739,36 @@ UnknownText_0x1b5d51: ; 0x1b5d51
UnknownText_0x1b5d9f: ; 0x1b5d9f
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good morning."
done
UnknownText_0x1b5dcc: ; 0x1b5dcc
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "How are you?"
done
UnknownText_0x1b5df8: ; 0x1b5df8
text "Hello, @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "speaking."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good evening."
done
UnknownText_0x1b5e25: ; 0x1b5e25
text "Good morning,"
- line $14, "."
+ line "<PLAY_G>."
para "This is @"
TX_RAM StringBuffer3
@@ -776,7 +777,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25
done
UnknownText_0x1b5e59: ; 0x1b5e59
- text "Hi, ", $14, "."
+ text "Hi, <PLAY_G>."
line "This is @"
TX_RAM StringBuffer3
text "."
@@ -787,7 +788,7 @@ UnknownText_0x1b5e59: ; 0x1b5e59
UnknownText_0x1b5e8e: ; 0x1b5e8e
text "Good evening,"
- line $14, "."
+ line "<PLAY_G>."
para "This is @"
TX_RAM StringBuffer3
@@ -823,7 +824,7 @@ UnknownText_0x1b5f7a: ; 0x1b5f7a
text " the"
line "HIKER here."
- para "Ah, ", $52, "!"
+ para "Ah, <PLAYER>!"
done
UnknownText_0x1b5f9e: ; 0x1b5f9e
@@ -832,7 +833,7 @@ UnknownText_0x1b5f9e: ; 0x1b5f9e
text " the"
line "HIKER here."
- para "Ah, ", $52, ","
+ para "Ah, <PLAYER>,"
line "right?"
done
@@ -842,36 +843,36 @@ UnknownText_0x1b5fc9: ; 0x1b5fc9
text " the"
line "HIKER here."
- para "Ah, ", $52, ", isn't"
+ para "Ah, <PLAYER>, isn't"
line "it?"
done
UnknownText_0x1b5ff6: ; 0x1b5ff6
- text "Yo, ", $52, "?"
+ text "Yo, <PLAYER>?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
UnknownText_0x1b6017: ; 0x1b6017
text "Hey, is this"
- line $52, "?"
+ line "<PLAYER>?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
UnknownText_0x1b6041: ; 0x1b6041
- text $52, ", you still"
+ text "<PLAYER>, you still"
line "awake?"
para "This is @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "the HIKER!"
done
@@ -897,7 +898,7 @@ UnknownText_0x1b60f5: ; 0x1b60f5
TX_RAM StringBuffer3
text " speaking."
- para "Hey, ", $14, "!"
+ para "Hey, <PLAY_G>!"
done
UnknownText_0x1b611b: ; 0x1b611b
@@ -907,7 +908,7 @@ UnknownText_0x1b611b: ; 0x1b611b
text " speaking."
para "This must be"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b6149: ; 0x1b6149
@@ -916,7 +917,7 @@ UnknownText_0x1b6149: ; 0x1b6149
TX_RAM StringBuffer3
text " speaking."
- para "Ah, ", $14, "!"
+ para "Ah, <PLAY_G>!"
done
UnknownText_0x1b616e: ; 0x1b616e
@@ -925,7 +926,7 @@ UnknownText_0x1b616e: ; 0x1b616e
TX_RAM StringBuffer3
text "."
- para $14, ", right?"
+ para "<PLAY_G>, right?"
done
UnknownText_0x1b618f: ; 0x1b618f
@@ -934,7 +935,7 @@ UnknownText_0x1b618f: ; 0x1b618f
TX_RAM StringBuffer3
text "."
- para $14, ", what are"
+ para "<PLAY_G>, what are"
line "you doing?"
done
@@ -944,7 +945,7 @@ UnknownText_0x1b61bd: ; 0x1b61bd
TX_RAM StringBuffer3
text "."
- para $14, ", sorry to"
+ para "<PLAY_G>, sorry to"
line "call you so late."
done
@@ -968,7 +969,7 @@ UnknownText_0x1b626a: ; 0x1b626a
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Good morning!"
done
@@ -978,7 +979,7 @@ UnknownText_0x1b6296: ; 0x1b6296
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Hi, how are you?"
done
@@ -988,12 +989,12 @@ UnknownText_0x1b62c5: ; 0x1b62c5
TX_RAM StringBuffer3
text "…"
- para "Oh, ", $14, "!"
+ para "Oh, <PLAY_G>!"
line "Good evening!"
done
UnknownText_0x1b62f1: ; 0x1b62f1
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1002,7 +1003,7 @@ UnknownText_0x1b62f1: ; 0x1b62f1
done
UnknownText_0x1b630e: ; 0x1b630e
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1011,7 +1012,7 @@ UnknownText_0x1b630e: ; 0x1b630e
done
UnknownText_0x1b6331: ; 0x1b6331
- text $14, "?"
+ text "<PLAY_G>?"
para "It's @"
TX_RAM StringBuffer3
@@ -1032,33 +1033,33 @@ UnknownText_0x1b6352: ; 0x1b6352
UnknownText_0x1b638c: ; 0x1b638c
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Hey, ", $14, "!"
+ para "Hey, <PLAY_G>!"
done
UnknownText_0x1b63a8: ; 0x1b63a8
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Wow, ", $14, "!"
+ para "Wow, <PLAY_G>!"
done
UnknownText_0x1b63c4: ; 0x1b63c4
text "Hello? @"
TX_RAM StringBuffer3
- db $0
+ text ""
line "here…"
- para "Yippee, ", $14, "!"
+ para "Yippee, <PLAY_G>!"
done
UnknownText_0x1b63e3: ; 0x1b63e3
text "Uh, hello."
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your pal,"
line "@"
@@ -1068,7 +1069,7 @@ UnknownText_0x1b63e3: ; 0x1b63e3
UnknownText_0x1b6407: ; 0x1b6407
text "Uh, hello,"
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your buddy"
line "@"
@@ -1078,7 +1079,7 @@ UnknownText_0x1b6407: ; 0x1b6407
UnknownText_0x1b642c: ; 0x1b642c
text "Uh, hello,"
- line $14, "?"
+ line "<PLAY_G>?"
para "It's your sidekick"
line "@"
@@ -1092,7 +1093,7 @@ UnknownText_0x1b6454: ; 0x1b6454
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b647e: ; 0x1b647e
@@ -1101,7 +1102,7 @@ UnknownText_0x1b647e: ; 0x1b647e
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b64a8: ; 0x1b64a8
@@ -1110,7 +1111,7 @@ UnknownText_0x1b64a8: ; 0x1b64a8
TX_RAM StringBuffer3
text "."
- para "…Huh, ", $14, "? Yo!"
+ para "…Huh, <PLAY_G>? Yo!"
done
UnknownText_0x1b64d2: ; 0x1b64d2
@@ -1120,7 +1121,7 @@ UnknownText_0x1b64d2: ; 0x1b64d2
text " calling."
para "What are you up"
- line "to, ", $14, "?"
+ line "to, <PLAY_G>?"
done
UnknownText_0x1b6506: ; 0x1b6506
@@ -1130,7 +1131,7 @@ UnknownText_0x1b6506: ; 0x1b6506
text " calling."
para "Where are you now,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b6539: ; 0x1b6539
@@ -1140,7 +1141,7 @@ UnknownText_0x1b6539: ; 0x1b6539
text " calling."
para "Are you awake now,"
- line $14, "?"
+ line "<PLAY_G>?"
done
UnknownText_0x1b656c: ; 0x1b656c
@@ -1154,7 +1155,7 @@ UnknownText_0x1b659d: ; 0x1b659d
TX_RAM StringBuffer3
text "!"
- para "Is this ", $14, "?"
+ para "Is this <PLAY_G>?"
line "Good morning!"
done
@@ -1163,7 +1164,7 @@ UnknownText_0x1b65c7: ; 0x1b65c7
TX_RAM StringBuffer3
text "!"
- para "Is that ", $14, "?"
+ para "Is that <PLAY_G>?"
done
UnknownText_0x1b65e3: ; 0x1b65e3
@@ -1171,7 +1172,7 @@ UnknownText_0x1b65e3: ; 0x1b65e3
TX_RAM StringBuffer3
text "!"
- para "Is that ", $14, "?"
+ para "Is that <PLAY_G>?"
line "Good evening!"
done
@@ -1197,7 +1198,7 @@ UnknownText_0x1b663b: ; 0x1b663b
done
UnknownText_0x1b6652: ; 0x1b6652
- text $14, ", are you"
+ text "<PLAY_G>, are you"
line "raising your"
cont "#MON properly?"
@@ -1215,7 +1216,7 @@ UnknownText_0x1b66c8: ; 0x1b66c8
text " on the"
line "line."
- para "Hey! It's ", $14, "!"
+ para "Hey! It's <PLAY_G>!"
done
UnknownText_0x1b66ec: ; 0x1b66ec
@@ -1225,7 +1226,7 @@ UnknownText_0x1b66ec: ; 0x1b66ec
line "line."
para "I know!"
- line "It's ", $14, "!"
+ line "It's <PLAY_G>!"
done
UnknownText_0x1b6713: ; 0x1b6713
@@ -1234,12 +1235,12 @@ UnknownText_0x1b6713: ; 0x1b6713
text " on the"
line "line."
- para $14, "?"
+ para "<PLAY_G>?"
line "What's up?"
done
UnknownText_0x1b6738: ; 0x1b6738
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1248,7 +1249,7 @@ UnknownText_0x1b6738: ; 0x1b6738
done
UnknownText_0x1b6757: ; 0x1b6757
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1257,7 +1258,7 @@ UnknownText_0x1b6757: ; 0x1b6757
done
UnknownText_0x1b6776: ; 0x1b6776
- text "Uh, ", $14, "?"
+ text "Uh, <PLAY_G>?"
para "It's me!"
line "It's me, @"
@@ -1284,7 +1285,7 @@ UnknownText_0x1b67e2: ; 0x1b67e2
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -1294,7 +1295,7 @@ UnknownText_0x1b680e: ; 0x1b680e
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, ", good"
+ para "Hi, <PLAY_G>, good"
line "day!"
done
@@ -1304,12 +1305,12 @@ UnknownText_0x1b6836: ; 0x1b6836
TX_RAM StringBuffer3
text "…"
- para "Hi, ", $14, ", good"
+ para "Hi, <PLAY_G>, good"
line "evening!"
done
UnknownText_0x1b6862: ; 0x1b6862
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "morning!"
para "It's @"
@@ -1319,7 +1320,7 @@ UnknownText_0x1b6862: ; 0x1b6862
done
UnknownText_0x1b6890: ; 0x1b6890
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "day!"
para "It's @"
@@ -1329,7 +1330,7 @@ UnknownText_0x1b6890: ; 0x1b6890
done
UnknownText_0x1b68ba: ; 0x1b68ba
- text "Hi, ", $14, ", good"
+ text "Hi, <PLAY_G>, good"
line "evening!"
para "It's @"
@@ -1358,28 +1359,28 @@ UnknownText_0x1b68e8: ; 0x1b68e8
done
UnknownText_0x1b69a8: ; 0x1b69a8
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good morning pika."
line "What's up pika?"
done
UnknownText_0x1b69d2: ; 0x1b69d2
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good day pika,"
line "what's up pika?"
done
UnknownText_0x1b69f8: ; 0x1b69f8
- text "Hi, ", $14, "?"
+ text "Hi, <PLAY_G>?"
para "Good evening pika,"
line "what's up pika?"
done
UnknownText_0x1b6a22: ; 0x1b6a22
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "morning!"
para "It's @"
@@ -1389,7 +1390,7 @@ UnknownText_0x1b6a22: ; 0x1b6a22
done
UnknownText_0x1b6a56: ; 0x1b6a56
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "pika day!"
para "It's @"
@@ -1399,7 +1400,7 @@ UnknownText_0x1b6a56: ; 0x1b6a56
done
UnknownText_0x1b6a8b: ; 0x1b6a8b
- text $14, " pika, good"
+ text "<PLAY_G> pika, good"
line "evening!"
para "It's @"
@@ -1429,7 +1430,7 @@ UnknownText_0x1b6b39: ; 0x1b6b39
text "…"
para "Oh, Good morning,"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b6b65: ; 0x1b6b65
@@ -1439,7 +1440,7 @@ UnknownText_0x1b6b65: ; 0x1b6b65
text "…"
para "That voice…"
- line $14, ", right?"
+ line "<PLAY_G>, right?"
done
UnknownText_0x1b6b92: ; 0x1b6b92
@@ -1449,7 +1450,7 @@ UnknownText_0x1b6b92: ; 0x1b6b92
text "…"
para "This must be"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b6bb9: ; 0x1b6bb9
@@ -1495,7 +1496,7 @@ UnknownText_0x1b6c96: ; 0x1b6c96
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
@@ -1504,7 +1505,7 @@ UnknownText_0x1b6cc6: ; 0x1b6cc6
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
@@ -1513,12 +1514,12 @@ UnknownText_0x1b6cf6: ; 0x1b6cf6
TX_RAM StringBuffer3
text " here…"
- para "Ah, ", $52, ". What"
+ para "Ah, <PLAYER>. What"
line "can I do for you?"
done
UnknownText_0x1b6d26: ; 0x1b6d26
- text "Hiya, ", $52, ". How"
+ text "Hiya, <PLAYER>. How"
line "are you doing?"
para "Hey! It's me,"
@@ -1528,7 +1529,7 @@ UnknownText_0x1b6d26: ; 0x1b6d26
done
UnknownText_0x1b6d57: ; 0x1b6d57
- text "Hiya, ", $52, ", how"
+ text "Hiya, <PLAYER>, how"
line "are you doing?"
para "Hey, it's me,"
@@ -1538,7 +1539,7 @@ UnknownText_0x1b6d57: ; 0x1b6d57
done
UnknownText_0x1b6d88: ; 0x1b6d88
- text "Hiya, ", $52, ", how"
+ text "Hiya, <PLAYER>, how"
line "are you doing?"
para "Hey, it's me,"
@@ -1562,7 +1563,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9
para "Heh, my @"
TX_RAM StringBuffer4
- db $0
+ text ""
line "is so tough, it"
para "doesn't need to go"
@@ -1576,7 +1577,7 @@ UnknownText_0x1b6e7c: ; 0x1b6e7c
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Good morning."
done
@@ -1586,7 +1587,7 @@ UnknownText_0x1b6ea6: ; 0x1b6ea6
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, "."
+ para "Oh, <PLAY_G>."
line "Hello."
done
@@ -1596,12 +1597,12 @@ UnknownText_0x1b6ec9: ; 0x1b6ec9
TX_RAM StringBuffer3
text "."
- para "Oh, ", $14, ", good"
+ para "Oh, <PLAY_G>, good"
line "evening."
done
UnknownText_0x1b6ef3: ; 0x1b6ef3
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Good morning. This"
line "is @"
@@ -1610,7 +1611,7 @@ UnknownText_0x1b6ef3: ; 0x1b6ef3
done
UnknownText_0x1b6f1c: ; 0x1b6f1c
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Hi, it's @"
TX_RAM StringBuffer3
@@ -1618,7 +1619,7 @@ UnknownText_0x1b6f1c: ; 0x1b6f1c
done
UnknownText_0x1b6f37: ; 0x1b6f37
- text "Is this ", $14, "?"
+ text "Is this <PLAY_G>?"
para "Good evening. This"
line "is @"
@@ -1655,7 +1656,7 @@ UnknownText_0x1b7019: ; 0x1b7019
TX_RAM StringBuffer3
text " here!"
- para "Morning, ", $14, "!"
+ para "Morning, <PLAY_G>!"
para "Are you using bird"
line "#MON?"
@@ -1667,7 +1668,7 @@ UnknownText_0x1b7057: ; 0x1b7057
TX_RAM StringBuffer3
text " here!"
- para "Hi, ", $14, "!"
+ para "Hi, <PLAY_G>!"
para "Are your bird"
line "#MON flying?"
@@ -1679,7 +1680,7 @@ UnknownText_0x1b7092: ; 0x1b7092
TX_RAM StringBuffer3
text " here!"
- para "Evening, ", $14, "!"
+ para "Evening, <PLAY_G>!"
line "Are you letting"
para "your bird #MON"
@@ -1688,7 +1689,7 @@ UnknownText_0x1b7092: ; 0x1b7092
UnknownText_0x1b70e7: ; 0x1b70e7
text "Good morning,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1697,7 +1698,7 @@ UnknownText_0x1b70e7: ; 0x1b70e7
done
UnknownText_0x1b7112: ; 0x1b7112
- text "Hi, ", $14, "!"
+ text "Hi, <PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1707,7 +1708,7 @@ UnknownText_0x1b7112: ; 0x1b7112
UnknownText_0x1b7132: ; 0x1b7132
text "Good evening,"
- line $14, "!"
+ line "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1721,7 +1722,7 @@ UnknownText_0x1b7161: ; 0x1b7161
para "My @"
TX_RAM StringBuffer4
- db $0
+ text ""
line "looks like it will"
para "get tough enough"
@@ -1737,7 +1738,7 @@ UnknownText_0x1b71d5: ; 0x1b71d5
TX_RAM StringBuffer3
text "…"
- para "Ah, ", $14, "."
+ para "Ah, <PLAY_G>."
done
UnknownText_0x1b71fc: ; 0x1b71fc
@@ -1746,7 +1747,7 @@ UnknownText_0x1b71fc: ; 0x1b71fc
TX_RAM StringBuffer3
text "…"
- para "Ah, ", $14, ", is"
+ para "Ah, <PLAY_G>, is"
line "it?"
done
@@ -1757,7 +1758,7 @@ UnknownText_0x1b722a: ; 0x1b722a
text "…"
para "Ah, if it isn't"
- line $14, "."
+ line "<PLAY_G>."
done
UnknownText_0x1b725c: ; 0x1b725c
@@ -1800,7 +1801,7 @@ UnknownText_0x1b730b: ; 0x1b730b
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "morning, hey?"
done
@@ -1808,7 +1809,7 @@ UnknownText_0x1b7331: ; 0x1b7331
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "weather, hey?"
done
@@ -1816,26 +1817,26 @@ UnknownText_0x1b7357: ; 0x1b7357
TX_RAM StringBuffer3
text " here…"
- para $52, "! Beautiful"
+ para "<PLAYER>! Beautiful"
line "moonlight, hey?"
done
UnknownText_0x1b737f: ; 0x1b737f
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
done
UnknownText_0x1b7397: ; 0x1b7397
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
done
UnknownText_0x1b73af: ; 0x1b73af
- text "Hey, ", $52, "!"
+ text "Hey, <PLAYER>!"
line "This is @"
TX_RAM StringBuffer3
text "!"
@@ -1848,7 +1849,7 @@ UnknownText_0x1b73c7: ; 0x1b73c7
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b73ef: ; 0x1b73ef
@@ -1858,7 +1859,7 @@ UnknownText_0x1b73ef: ; 0x1b73ef
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b7417: ; 0x1b7417
@@ -1868,11 +1869,11 @@ UnknownText_0x1b7417: ; 0x1b7417
text "!"
para "Hah, and here's"
- line $14, "!"
+ line "<PLAY_G>!"
done
UnknownText_0x1b743f: ; 0x1b743f
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1882,7 +1883,7 @@ UnknownText_0x1b743f: ; 0x1b743f
done
UnknownText_0x1b746f: ; 0x1b746f
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1892,7 +1893,7 @@ UnknownText_0x1b746f: ; 0x1b746f
done
UnknownText_0x1b749b: ; 0x1b749b
- text $14, ", it's"
+ text "<PLAY_G>, it's"
line "@"
TX_RAM StringBuffer3
text "!"
@@ -1920,7 +1921,7 @@ UnknownText_0x1b751a: ; 0x1b751a
TX_RAM StringBuffer3
text "…"
- para "Oh. Hi, ", $14, "!"
+ para "Oh. Hi, <PLAY_G>!"
line "Good morning!"
done
@@ -1930,7 +1931,7 @@ UnknownText_0x1b7548: ; 0x1b7548
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
line "Yahoo!"
done
@@ -1940,11 +1941,11 @@ UnknownText_0x1b756f: ; 0x1b756f
TX_RAM StringBuffer3
text "…"
- para "Oh, hi, ", $14, "!"
+ para "Oh, hi, <PLAY_G>!"
done
UnknownText_0x1b758f: ; 0x1b758f
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1953,7 +1954,7 @@ UnknownText_0x1b758f: ; 0x1b758f
done
UnknownText_0x1b75ac: ; 0x1b75ac
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
@@ -1962,7 +1963,7 @@ UnknownText_0x1b75ac: ; 0x1b75ac
done
UnknownText_0x1b75c9: ; 0x1b75c9
- text $14, "!"
+ text "<PLAY_G>!"
para "It's @"
TX_RAM StringBuffer3
diff --git a/text/sweethoney.asm b/text/sweethoney.asm
index 334e62095..9bfa4f6b1 100644
--- a/text/sweethoney.asm
+++ b/text/sweethoney.asm
@@ -31,7 +31,7 @@ UnusedSweetHoneyGiveText: ; 0x55819
done
UnusedGotSweetHoneyText: ; 0x5583e
- text $52, " received"
+ text "<PLAYER> received"
line "SWEET HONEY."
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 16:26:07 +0000