summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle/battle_text.asm98
-rw-r--r--data/common_text/common_text_1.asm124
-rw-r--r--data/common_text/common_text_2.asm140
-rw-r--r--data/common_text/common_text_3.asm86
-rw-r--r--data/default_options.asm10
-rw-r--r--data/maps/data.asm16
-rw-r--r--data/phone/text/bill.asm4
-rw-r--r--data/phone/text/extra.asm148
-rw-r--r--data/phone/text/extra2.asm172
-rw-r--r--data/phone/text/gaven_overworld.asm4
-rw-r--r--data/phone/text/jose_overworld.asm2
-rw-r--r--data/phone/text/mom.asm16
-rw-r--r--data/phone/text/trainers1.asm364
-rw-r--r--data/special_pointers.asm2
-rw-r--r--data/std_text.asm14
-rw-r--r--data/text_buffers.asm14
-rw-r--r--data/trainers/palettes.asm2
-rw-r--r--data/unused/gen_1_trainer_names.asm52
18 files changed, 634 insertions, 634 deletions
diff --git a/data/battle/battle_text.asm b/data/battle/battle_text.asm
index eaff02017..1a609b476 100644
--- a/data/battle/battle_text.asm
+++ b/data/battle/battle_text.asm
@@ -10,7 +10,7 @@ BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
WildPokemonAppearedText: ; 0x80746
text "Wild @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -19,14 +19,14 @@ WildPokemonAppearedText: ; 0x80746
HookedPokemonAttackedText: ; 0x8075c
text "The hooked"
line "@"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
; 0x80778
PokemonFellFromTreeText: ; 0x80778
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
@@ -34,7 +34,7 @@ PokemonFellFromTreeText: ; 0x80778
WildCelebiAppearedText: ; 0x80793
text "Wild @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -48,7 +48,7 @@ WantsToBattleText:: ; 0x807a9
BattleText_WildFled: ; 0x807bd
text "Wild @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
@@ -56,7 +56,7 @@ BattleText_WildFled: ; 0x807bd
BattleText_EnemyFled: ; 0x807cf
text "Enemy @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
@@ -110,7 +110,7 @@ BattleText_TargetRecoveredWithItem: ; 0x80880
text "<TARGET>"
line "recovered with"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
; 0x80899
@@ -119,7 +119,7 @@ BattleText_UserRecoveredPPUsing: ; 0x80899
text "<USER>"
line "recovered PP using"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
; 0x808b6
@@ -138,14 +138,14 @@ BattleText_SafeguardFaded: ; 0x808d2
; 0x808e7
BattleText_PkmnLightScreenFell: ; 0x808e7
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
; 0x80905
BattleText_PkmnReflectFaded: ; 0x80905
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
@@ -188,7 +188,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
BattleText_EnemyPkmnFainted: ; 0x809a8
text "Enemy @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "fainted!"
prompt
@@ -237,7 +237,7 @@ BattleText_0x80a4f: ; 0x80a4f
; 0x80a75
BattleText_PkmnFainted: ; 0x80a75
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text_start
line "fainted!"
prompt
@@ -265,7 +265,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
text "<ENEMY>"
line "is about to use"
cont "@"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text "."
para "Will <PLAYER>"
@@ -277,7 +277,7 @@ BattleText_EnemySentOut: ; 0x80af8
text "<ENEMY>"
line "sent out"
cont "@"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text "!"
done
; 0x80b0b
@@ -313,7 +313,7 @@ BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
text "<USER>"
line "fled using a"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x80ba0
@@ -333,7 +333,7 @@ RecoveredUsingText: ; 0x80bc2
text "<TARGET>"
line "recovered using a"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x80bde
@@ -341,7 +341,7 @@ RecoveredUsingText: ; 0x80bc2
BattleText_UsersStringBuffer1Activated: ; 0x80bde
text "<USER>'s"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
cont "activated!"
prompt
@@ -354,14 +354,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text_start
line "is already out."
prompt
; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
@@ -380,7 +380,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text_start
line "has no moves left!"
done
@@ -393,10 +393,10 @@ BattleText_TargetsEncoreEnded: ; 0x80c8a
; 0x80c9c
BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " grew to"
line "level @"
- deciram CurPartyLevel, 1, 3
+ deciram wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
db "@@"
@@ -404,7 +404,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "is eating!"
prompt
@@ -412,7 +412,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba
BattleText_WildPkmnIsAngry: ; 0x80cd1
text "Wild @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@@ -480,7 +480,7 @@ BecameConfusedText: ; 0x80d97
BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " rid"
line "<TARGET>"
cont "of its confusion."
@@ -497,7 +497,7 @@ BattleText_UsersHurtByStringBuffer1: ; 0x80de2
text "<USER>'s"
line "hurt by"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x80df5
@@ -506,7 +506,7 @@ BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
text "<USER>"
line "was released from"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x80e11
@@ -560,7 +560,7 @@ HungOnText: ; 0x80e99
text "<TARGET>"
line "hung on with"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x80eb0
@@ -588,49 +588,49 @@ InfatuationText: ; 0x80eda
DisabledMoveText: ; 0x80f02
text "<USER>'s"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " is"
cont "DISABLED!"
prompt
; 0x80f19
LoafingAroundText: ; 0x80f19
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " is"
line "loafing around."
prompt
; 0x80f31
BeganToNapText: ; 0x80f31
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " began"
line "to nap!"
prompt
; 0x80f44
WontObeyText: ; 0x80f44
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " won't"
line "obey!"
prompt
; 0x80f54
TurnedAwayText: ; 0x80f54
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " turned"
line "away!"
prompt
; 0x80f66
IgnoredOrdersText: ; 0x80f66
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
; 0x80f7b
IgnoredSleepingText: ; 0x80f7b
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
@@ -646,7 +646,7 @@ HasNoPPLeftText: ; 0x80fba
text "<USER>"
line "has no PP left for"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "!"
prompt
; 0x80fd7
@@ -758,7 +758,7 @@ SketchedText: ; 0x81143
text "<USER>"
line "SKETCHED"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x81156
@@ -773,7 +773,7 @@ DestinyBondEffectText: ; 0x81156
SpiteEffectText: ; 0x8117f
text "<TARGET>'s"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " was"
cont "reduced by @"
deciram wd265, 1, 1
@@ -850,7 +850,7 @@ WasFrozenText: ; 0x8125d
WontRiseAnymoreText: ; 0x81272
text "<USER>'s"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " won't"
cont "rise anymore!"
prompt
@@ -859,7 +859,7 @@ WontRiseAnymoreText: ; 0x81272
WontDropAnymoreText: ; 0x8128f
text "<TARGET>'s"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " won't"
cont "drop anymore!"
prompt
@@ -885,14 +885,14 @@ BlownAwayText: ; 0x812d2
PlayerHitTimesText: ; 0x812e5
text "Hit @"
- deciram PlayerDamageTaken, 1, 1
+ deciram wPlayerDamageTaken, 1, 1
text " times!"
prompt
; 0x812f8
EnemyHitTimesText: ; 0x812f8
text "Hit @"
- deciram EnemyDamageTaken, 1, 1
+ deciram wEnemyDamageTaken, 1, 1
text " times!"
prompt
; 0x8130b
@@ -957,7 +957,7 @@ LearnedMoveText: ; 0x813e6
text "<USER>"
line "learned"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x813f8
@@ -977,7 +977,7 @@ EvadedText: ; 0x81407
WasDisabledText: ; 0x8141d
text "<TARGET>'s"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " was"
cont "DISABLED!"
prompt
@@ -993,7 +993,7 @@ TransformedTypeText: ; 0x81452
text "<USER>"
line "transformed into"
cont "the @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "-type!"
prompt
; 0x81476
@@ -1008,7 +1008,7 @@ TransformedText: ; 0x81499
text "<USER>"
line "TRANSFORMED into"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x814b4
@@ -1088,7 +1088,7 @@ ProtectedByText: ; 0x815a9
text "<TARGET>'s"
line "protected by"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
; 0x815c1
@@ -1102,7 +1102,7 @@ MirrorMoveFailedText: ; 0x815c1
StoleText: ; 0x815da
text "<USER>"
line "stole @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
cont "from its foe!"
prompt
@@ -1260,7 +1260,7 @@ ForesawAttackText: ; 0x81817
; 0x8182d
BeatUpAttackText: ; 0x8182d
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "attack!"
done
diff --git a/data/common_text/common_text_1.asm b/data/common_text/common_text_1.asm
index 38007bc43..80b47013d 100644
--- a/data/common_text/common_text_1.asm
+++ b/data/common_text/common_text_1.asm
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
_HeyItsFruitText::
text "Hey! It's"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
_ObtainedFruitText::
text "Obtained"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -38,7 +38,7 @@ UnknownText_0x1bc089::
done
UnknownText_0x1bc0a2::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "recovered @"
deciram wd1f3, 2, 3
@@ -46,59 +46,59 @@ UnknownText_0x1bc0a2::
done
UnknownText_0x1bc0bb::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "cured of poison."
done
UnknownText_0x1bc0d2::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "rid of paralysis."
done
UnknownText_0x1bc0ea::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "burn was healed."
done
UnknownText_0x1bc101::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "was defrosted."
done
UnknownText_0x1bc115::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "woke up."
done
UnknownText_0x1bc123::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "health returned."
done
UnknownText_0x1bc13a::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "is revitalized."
done
UnknownText_0x1bc14f::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " grew to"
line "level @"
- deciram CurPartyLevel, 1, 3
+ deciram wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
db "@@"
UnknownText_0x1bc16e::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " came"
line "to its senses."
done
@@ -276,7 +276,7 @@ UnknownText_0x1bc4b2::
UnknownText_0x1bc4d7::
text "Put away the"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
prompt
@@ -288,19 +288,19 @@ UnknownText_0x1bc4ec::
UnknownText_0x1bc509::
text "Set up the"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
prompt
UnknownText_0x1bc51c::
text "Put away the"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
para "and set up the"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
prompt
@@ -331,7 +331,7 @@ UnknownText_0x1bc5b3::
UnknownText_0x1bc5d7::
text "It's an adorable"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -517,14 +517,14 @@ _OPT_OakText2::
_OPT_OakText3::
text_start
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
done
_OPT_MaryText1::
text_start
line "MARY: @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
done
@@ -695,7 +695,7 @@ _OPT_PokemonChannelText::
_PokedexShowText::
text_start
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
db "@@"
; Pokémon Music Channel / Pokémusic
@@ -793,7 +793,7 @@ _LC_Text8::
text_start
line "Number is @"
interpret_data
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
done
@@ -842,9 +842,9 @@ _PnP_Text3::
_PnP_Text4::
text_start
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
db "@@"
_PnP_cute::
@@ -930,7 +930,7 @@ _PnP_odd::
_PnP_Text5::
text_start
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
db "@@"
_RocketRadioText1::
@@ -1009,7 +1009,7 @@ _BuenaRadioText3::
_BuenaRadioText4::
text_start
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
done
@@ -1085,7 +1085,7 @@ Text_EnemyWithdrew::
text "<ENEMY>"
line "withdrew"
cont "@"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text "!"
prompt
@@ -1095,7 +1095,7 @@ Text_EnemyUsedOn::
text_from_ram wMonOrItemNameBuffer
text_start
cont "on @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text "!"
prompt
@@ -1111,7 +1111,7 @@ Text_ThatItemCantBePutInThePack::
Text_TheItemWasPutInThePack::
text "The @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "was put in the"
cont "PACK."
@@ -1138,7 +1138,7 @@ UnknownText_0x1bd05e::
UnknownText_0x1bd07f::
text "Will you play with"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -1173,7 +1173,7 @@ UnknownText_0x1bd11c::
UnknownText_0x1bd131::
text "Test event"
line "@"
- deciram StringBuffer2, 1, 2
+ deciram wStringBuffer2, 1, 2
text "?"
done
@@ -1205,7 +1205,7 @@ UnknownText_0x1bd188::
UnknownText_0x1bd19a::
text "A new CARD arrived"
line "from @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
done
@@ -1215,10 +1215,10 @@ UnknownText_0x1bd1ba::
done
UnknownText_0x1bd1dd::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "'s CARD was"
line "listed as no.@"
- deciram StringBuffer1, 1, 2
+ deciram wStringBuffer1, 1, 2
text "."
prompt
@@ -1251,10 +1251,10 @@ UnknownText_0x1bd266::
UnknownText_0x1bd286::
text "Trading @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text_start
line "for @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "…"
done
@@ -1286,7 +1286,7 @@ UnknownText_0x1bd308::
UnknownText_0x1bd321::
text "<PLAYER> found"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1298,10 +1298,10 @@ UnknownText_0x1bd331::
UnknownText_0x1bd34b::
text "I just saw some"
line "rare @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " in"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
para "I'll call you if I"
@@ -1315,10 +1315,10 @@ UnknownText_0x1bd39e::
done
UnknownText_0x1bd3be::
- text_from_ram PlayerName
+ text_from_ram wPlayerName
text " received"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!@"
sound_item
text_waitbutton
@@ -1344,7 +1344,7 @@ UnknownText_0x1bd429::
text_from_ram wMonOrItemNameBuffer
text " for"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text ".@@"
UnknownText_0x1bd445::
@@ -1356,12 +1356,12 @@ UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -1373,7 +1373,7 @@ UnknownText_0x1bd48c::
UnknownText_0x1bd4aa::
text "Huh? That's not"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text ". "
cont "What a letdown…"
done
@@ -1381,7 +1381,7 @@ UnknownText_0x1bd4aa::
UnknownText_0x1bd4d2::
text "Yay! I got myself"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
cont "Thanks!"
done
@@ -1389,7 +1389,7 @@ UnknownText_0x1bd4d2::
UnknownText_0x1bd4f4::
text "Hi, how's my old"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " doing?"
done
@@ -1399,12 +1399,12 @@ UnknownText_0x1bd512::
para "If you have"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text ", would"
para "you trade it for"
line "my @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -1419,7 +1419,7 @@ UnknownText_0x1bd565::
UnknownText_0x1bd5a1::
text "You don't have"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "? That's"
cont "too bad, then."
done
@@ -1429,7 +1429,7 @@ UnknownText_0x1bd5cc::
para "I finally got"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
done
@@ -1448,12 +1448,12 @@ UnknownText_0x1bd621::
para "it. Do you have"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -1465,7 +1465,7 @@ UnknownText_0x1bd673::
UnknownText_0x1bd696::
text "That's not"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
para "Please trade with"
@@ -1483,7 +1483,7 @@ UnknownText_0x1bd6cd::
UnknownText_0x1bd6f5::
text "How is that"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " I"
cont "traded you doing?"
@@ -1709,7 +1709,7 @@ UnknownText_0x1bdcff::
UnknownText_0x1bdd30::
text "OK. I'll raise"
line "your @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
@@ -1722,25 +1722,25 @@ UnknownText_0x1bdd64::
text "Are we geniuses or"
line "what? Want to see"
cont "your @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
done
UnknownText_0x1bdd96::
text "Your @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "has grown a lot."
para "By level, it's"
line "grown by @"
- deciram StringBuffer2 + 1, 1, 3
+ deciram wStringBuffer2 + 1, 1, 3
text "."
para "If you want your"
line "#MON back, it"
cont "will cost ¥@"
- deciram StringBuffer2 + 2, 3, 4
+ deciram wStringBuffer2 + 2, 3, 4
text "."
done
@@ -1752,14 +1752,14 @@ UnknownText_0x1bde04::
UnknownText_0x1bde1f::
text "<PLAYER> got back"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
UnknownText_0x1bde32::
text "Huh? Back already?"
line "Your @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
para "needs a little"
line "more time with us."
diff --git a/data/common_text/common_text_2.asm b/data/common_text/common_text_2.asm
index bddd0d470..183d254fc 100644
--- a/data/common_text/common_text_2.asm
+++ b/data/common_text/common_text_2.asm
@@ -27,7 +27,7 @@ UnknownText_0x1c00a0::
UnknownText_0x1c00cd::
text "Hm… @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "…"
line "That's a fairly"
cont "decent name."
@@ -60,13 +60,13 @@ UnknownText_0x1c019e::
UnknownText_0x1c01be::
text "Hm… @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
line "What a great name!"
cont "It's perfect."
para "Treat @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "with loving care."
done
@@ -90,26 +90,26 @@ UnknownText_0x1c0272::
text "All right. This"
line "#MON is now"
cont "named @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
Text_Gained::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " gained@@"
Text_ABoostedStringBuffer2ExpPoints::
text_start
line "a boosted"
cont "@"
- deciram StringBuffer2, 2, 4
+ deciram wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_StringBuffer2ExpPoints::
text_start
line "@"
- deciram StringBuffer2, 2, 4
+ deciram wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
@@ -128,12 +128,12 @@ Text_YourFoesWeakGetmPkmn::
line "Get'm, @@"
Text_BattleMonNick01::
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text "!"
done
Text_BattleMonNickComma::
- text_from_ram BattleMonNick
+ text_from_ram wBattleMonNick
text ",@@"
Text_ThatsEnoughComeBack::
@@ -164,26 +164,26 @@ UnknownText_0x1c0384::
UnknownText_0x1c0396::
text "It contained"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
para "Teach @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text_start
line "to a #MON?"
done
UnknownText_0x1c03c2::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " is"
line "not compatible"
cont "with @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
para "It can't learn"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -191,14 +191,14 @@ UnknownText_0x1c03fa::
text "You have no room"
line "for any more"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "S."
prompt
UnknownText_0x1c0421::
text "You received"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
@@ -236,7 +236,7 @@ UnknownText_0x1c04e9::
text_from_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
@@ -244,7 +244,7 @@ UnknownText_0x1c04fa::
text_from_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
cont "to @"
text_from_ram wMysteryGiftPlayerName
@@ -292,7 +292,7 @@ UnknownText_0x1c05c8::
prompt
UnknownText_0x1c05dd::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "CUT!"
prompt
@@ -309,7 +309,7 @@ UnknownText_0x1c0609::
db "@@"
_UsedSurfText::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "SURF!"
done
@@ -330,7 +330,7 @@ _AskSurfText::
done
UnknownText_0x1c068e::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "WATERFALL!"
done
@@ -346,7 +346,7 @@ UnknownText_0x1c06bf::
done
UnknownText_0x1c06de::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "DIG!"
done
@@ -379,13 +379,13 @@ UnknownText_0x1c0751::
prompt
UnknownText_0x1c0774::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "STRENGTH!"
done
UnknownText_0x1c0788::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " can"
line "move boulders."
prompt
@@ -409,7 +409,7 @@ UnknownText_0x1c07f4::
done
UnknownText_0x1c0816::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "WHIRLPOOL!"
prompt
@@ -431,7 +431,7 @@ UnknownText_0x1c0864::
done
UnknownText_0x1c0897::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " did a"
line "HEADBUTT!"
prompt
@@ -449,7 +449,7 @@ UnknownText_0x1c08bc::
done
UnknownText_0x1c08f0::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " used"
line "ROCK SMASH!"
prompt
@@ -489,14 +489,14 @@ UnknownText_0x1c099a::
UnknownText_0x1c09b2::
text "<PLAYER> got on the"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
done
UnknownText_0x1c09c7::
text "<PLAYER> got off"
line "the @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
done
@@ -515,7 +515,7 @@ UnknownText_0x1c0a05::
UnknownText_0x1c0a1c::
text "<PLAYER> found"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -545,7 +545,7 @@ UnknownText_0x1c0aa9::
prompt
UnknownText_0x1c0acc::
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "fainted!"
prompt
@@ -559,7 +559,7 @@ UnknownText_0x1c0ada::
prompt
UnknownText_0x1c0b03::
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " used"
line "SWEET SCENT!"
done
@@ -601,14 +601,14 @@ UnknownText_0x1c0bbb::
deciram wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c0bd8::
text "Threw away"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)."
prompt
@@ -626,7 +626,7 @@ Text_YouDontHaveAPkmn::
UnknownText_0x1c0c2e::
text "Registered the"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -657,7 +657,7 @@ Text_AreYouABoyOrAreYouAGirl::
UnknownText_0x1c0cc6::
text "<USER>'s"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
db "@@"
UnknownText_0x1c0cd0::
@@ -672,7 +672,7 @@ UnknownText_0x1c0ce0::
UnknownText_0x1c0ceb::
text "<TARGET>'s"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
db "@@"
UnknownText_0x1c0cf5::
@@ -733,7 +733,7 @@ _UsedInsteadText::
cont "@@"
_MoveNameText::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
db "@@"
_EndUsedMove1Text::
@@ -766,7 +766,7 @@ UnknownText_0x1c0db8::
done
UnknownText_0x1c0dba::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " came"
line "out of its EGG!@"
sound_caught_mon
@@ -776,7 +776,7 @@ UnknownText_0x1c0dba::
UnknownText_0x1c0dd8::
text "Give a nickname to"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
done
@@ -804,28 +804,28 @@ UnknownText_0x1c0e54::
UnknownText_0x1c0e6f::
text "It has no interest"
line "in @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0e8d::
text "It appears to care"
line "for @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0eac::
text "It's friendly with"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0ec6::
text "It shows interest"
line "in @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
@@ -874,10 +874,10 @@ UnknownText_0x1c0fb8::
UnknownText_0x1c0fbc::
deciram wcf64, 1, 3
text " @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "Animation type @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
db "@@"
UnknownText_0x1c0fdd::
@@ -885,7 +885,7 @@ UnknownText_0x1c0fdd::
done
Text_WasSentToBillsPC::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " was"
line "sent to BILL's PC."
prompt
@@ -924,7 +924,7 @@ UnknownText_0x1c10a2::
UnknownText_0x1c10c0::
text "Caught @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
prompt
@@ -935,7 +935,7 @@ UnknownText_0x1c10cf::
UnknownText_0x1c10dd::
text "You already caught"
line "a @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
@@ -950,7 +950,7 @@ ContestJudging_FirstPlaceText::
text ","
line "who caught a"
cont "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!@@"
ContestJudging_FirstPlaceScoreText::
@@ -970,7 +970,7 @@ ContestJudging_SecondPlaceText::
para "who caught a"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!@@"
ContestJudging_SecondPlaceScoreText::
@@ -990,7 +990,7 @@ ContestJudging_ThirdPlaceText::
para "who caught a"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!@@"
ContestJudging_ThirdPlaceScoreText::
@@ -1008,7 +1008,7 @@ UnknownText_0x1c1203::
para "…Hm, it measures"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
@@ -1016,7 +1016,7 @@ UnknownText_0x1c123a::
text "CURRENT RECORD"
para "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " caught by"
line "@"
text_from_ram wMagikarpRecordHoldersName
@@ -1030,7 +1030,7 @@ UnknownText_0x1c1261::
line "with the ID number"
para "of @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " in"
line "your party."
prompt
@@ -1042,7 +1042,7 @@ UnknownText_0x1c12ae::
line "with the ID number"
para "of @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " in"
line "your PC BOX."
prompt
@@ -1050,7 +1050,7 @@ UnknownText_0x1c12ae::
UnknownText_0x1c12fc::
text "Give a nickname to"
line "the @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " you"
cont "received?"
done
@@ -1081,7 +1081,7 @@ _KrissPCWithdrewItemsText::
deciram wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)."
prompt
@@ -1104,7 +1104,7 @@ _KrissPCDepositItemsText::
deciram wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)."
prompt
@@ -1161,10 +1161,10 @@ _OakPCText2::
prompt
_OakPCText3::
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " #MON seen"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " #MON owned"
para "PROF.OAK's"
@@ -1352,7 +1352,7 @@ UnknownText_0x1c1a6c::
UnknownText_0x1c1a90::
text "Toss out how many"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)?"
done
@@ -1361,14 +1361,14 @@ UnknownText_0x1c1aad::
deciram wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aca::
text "Discarded"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "(S)."
prompt
@@ -1388,12 +1388,12 @@ UnknownText_0x1c1b2c::
text_from_ram wMonOrItemNameBuffer
text "'s"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " and"
para "made it hold"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -1402,7 +1402,7 @@ UnknownText_0x1c1b57::
text_from_ram wMonOrItemNameBuffer
text_start
line "hold @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -1424,7 +1424,7 @@ UnknownText_0x1c1baa::
UnknownText_0x1c1bc4::
text "Took @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text_start
line "from @"
text_from_ram wMonOrItemNameBuffer
@@ -1437,7 +1437,7 @@ UnknownText_0x1c1bdc::
line "already holding"
para "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
line "Switch items?"
done
@@ -1455,7 +1455,7 @@ UnknownText_0x1c1c22::
UnknownText_0x1c1c47::
text "MAIL detached from"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
prompt
diff --git a/data/common_text/common_text_3.asm b/data/common_text/common_text_3.asm
index 253fda4ac..7724775a4 100644
--- a/data/common_text/common_text_3.asm
+++ b/data/common_text/common_text_3.asm
@@ -65,7 +65,7 @@ UnknownText_0x1c41b1::
UnknownText_0x1c41e6::
text "Your friend's"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " appears"
cont "to be abnormal!"
prompt
@@ -75,7 +75,7 @@ UnknownText_0x1c4212::
text_from_ram wd004
text_start
line "for @"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
done
@@ -124,7 +124,7 @@ UnknownText_0x1c4298::
UnknownText_0x1c439c::
text "Today's remaining"
line "time is @"
- deciram StringBuffer2, 1, 2
+ deciram wStringBuffer2, 1, 2
text " min."
para "Would you like to"
@@ -133,7 +133,7 @@ UnknownText_0x1c439c::
UnknownText_0x1c43dc::
text "There are only @"
- deciram StringBuffer2, 1, 2
+ deciram wStringBuffer2, 1, 2
text_start
line "min. left today."
@@ -180,7 +180,7 @@ UnknownText_0x1c4508::
UnknownText_0x1c4525::
text "Today's remaining"
line "time is @"
- deciram StringBuffer2, 1, 2
+ deciram wStringBuffer2, 1, 2
text " min."
done
@@ -257,23 +257,23 @@ UnknownText_0x1c4706::
UnknownText_0x1c4719::
text "<PLAYER> received"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
done
UnknownText_0x1c472c::
text "<PLAYER> put the"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " in"
cont "the @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
prompt
UnknownText_0x1c474b::
text "The @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "is full…"
prompt
@@ -447,7 +447,7 @@ UnknownText_0x1c4ae5::
UnknownText_0x1c4b92::
text "Congratulations!"
line "Your @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
db "@@"
UnknownText_0x1c4baf::
@@ -455,20 +455,20 @@ UnknownText_0x1c4baf::
para "evolved into"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "!"
done
UnknownText_0x1c4bc5::
text "Huh? @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text_start
line "stopped evolving!"
prompt
UnknownText_0x1c4be3::
text "What? @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text_start
line "is evolving!"
done
@@ -480,7 +480,7 @@ UnknownText_0x1c4bfd::
UnknownText_0x1c4c08::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)"
line "will be ¥@"
deciram hMoneyTemp, 3, 6
@@ -509,7 +509,7 @@ UnknownText_0x1c4ca3::
UnknownText_0x1c4cae::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)"
line "will be ¥@"
deciram hMoneyTemp, 3, 6
@@ -548,7 +548,7 @@ UnknownText_0x1c4d47::
done
UnknownText_0x1c4db0::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " costs"
line "¥@"
deciram hMoneyTemp, 3, 6
@@ -592,7 +592,7 @@ UnknownText_0x1c4e7e::
UnknownText_0x1c4e89::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)"
line "will cost ¥@"
deciram hMoneyTemp, 3, 6
@@ -675,7 +675,7 @@ UnknownText_0x1c502e::
deciram hMoneyTemp, 3, 6
text " for"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "(S)."
done
@@ -705,7 +705,7 @@ UnknownText_0x1c5092::
UnknownText_0x1c509f::
text "lined up!"
line "Won @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " coins!"
done
@@ -935,7 +935,7 @@ UnknownText_0x1c5660::
text_from_ram wMonOrItemNameBuffer
text " learned"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
@@ -949,7 +949,7 @@ UnknownText_0x1c5678::
UnknownText_0x1c5699::
text "Stop learning"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -958,7 +958,7 @@ UnknownText_0x1c56af::
text_start
line "did not learn"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -967,7 +967,7 @@ UnknownText_0x1c56c9::
text " is"
line "trying to learn"
cont "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
para "But @"
@@ -979,7 +979,7 @@ UnknownText_0x1c56c9::
para "Delete an older"
line "move to make room"
cont "for @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "?"
done
@@ -997,7 +997,7 @@ UnknownText_0x1c574e::
text_from_ram wMonOrItemNameBuffer
text " forgot"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "."
para "And…"
@@ -1077,7 +1077,7 @@ UnknownText_0x1c589f::
done
UnknownText_0x1c58bc::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
line "Is that right?"
done
@@ -1148,7 +1148,7 @@ Text_OnlyThreePkmnMayBeEntered::
Text_ThePkmnMustAllBeDifferentKinds::
text "The @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " #MON"
line "must all be"
cont "different kinds."
@@ -1158,7 +1158,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
Text_ThePkmnMustNotHoldTheSameItems::
text "The @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " #MON"
line "must not hold the"
cont "same items."
@@ -1208,7 +1208,7 @@ UnknownText_0x1c5afa::
UnknownText_0x1c5b17::
text "Gotcha! @"
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text_start
line "was caught!@"
sound_caught_mon
@@ -1225,7 +1225,7 @@ UnknownText_0x1c5b38::
prompt
UnknownText_0x1c5b53::
- text_from_ram EnemyMonNick
+ text_from_ram wEnemyMonNick
text "'s data"
line "was newly added to"
cont "the #DEX.@"
@@ -1236,15 +1236,15 @@ UnknownText_0x1c5b53::
UnknownText_0x1c5b7f::
text "Give a nickname to"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
done
UnknownText_0x1c5b9a::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "'s"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text " rose."
prompt
@@ -1302,13 +1302,13 @@ Text_RestoreThePPOfWhichMove::
done
Text_PPIsMaxedOut::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "'s PP"
line "is maxed out."
prompt
Text_PPsIncreased::
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "'s PP"
line "increased."
prompt
@@ -1324,7 +1324,7 @@ UnknownText_0x1c5d03::
text_start
para "@"
- text_from_ram PlayerName
+ text_from_ram wPlayerName
text " sent the"
line "trophy home."
prompt
@@ -1371,7 +1371,7 @@ UnknownText_0x1c5e01::
UnknownText_0x1c5e1d::
text "Can't get on your"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " now."
prompt
@@ -1384,14 +1384,14 @@ UnknownText_0x1c5e3a::
UnknownText_0x1c5e68::
text "<PLAYER> used the@"
text_low
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
done
UnknownText_0x1c5e7b::
text "<PLAYER> got on the@"
text_low
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -1399,15 +1399,15 @@ UnknownText_0x1c5e90::
text "<PLAYER> got off@"
text_low
text "the @"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c5ea8::
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text " knows"
line "@"
- text_from_ram StringBuffer2
+ text_from_ram wStringBuffer2
text "."
prompt
@@ -1419,7 +1419,7 @@ UnknownText_0x1c5eba::
UnknownText_0x1c5eda::
text "Oh, make it forget"
line "@"
- text_from_ram StringBuffer1
+ text_from_ram wStringBuffer1
text "?"
done
diff --git a/data/default_options.asm b/data/default_options.asm
index 4717dc2f0..7a4f77128 100644
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -1,15 +1,15 @@
DefaultOptions: ; 14f7c
-; Options: med text speed
+; wOptions: med text speed
db TEXT_DELAY_MED
; wSaveFileExists: no
db $00
-; TextBoxFrame: frame 1
+; wTextBoxFrame: frame 1
db FRAME_1
-; TextBoxFlags: use text speed
+; wTextBoxFlags: use text speed
db 1 << FAST_TEXT_DELAY_F
-; GBPrinter: normal brightness
+; wGBPrinter: normal brightness
db GBPRINTER_NORMAL
-; Options2: menu account on
+; wOptions2: menu account on
db 1 << MENU_ACCOUNT
db $00
diff --git a/data/maps/data.asm b/data/maps/data.asm
index 0cdfb0826..6344f0572 100644
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -24,12 +24,12 @@ if "\1" == "north"
;\7: this map id
map \2
dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
- dw OverworldMap + \4 + 3
+ dw wOverworldMap + \4 + 3
db \6
db \2_WIDTH
db \2_HEIGHT * 2 - 1
db (\4 - \5) * -2
- dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
+ dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
endc
if "\1" == "south"
@@ -41,12 +41,12 @@ if "\1" == "south"
;\7: this map id
map \2
dw \3_Blocks + \5
- dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
+ dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
db \6
db \2_WIDTH
db 0
db (\4 - \5) * -2
- dw OverworldMap + \2_WIDTH + 7
+ dw wOverworldMap + \2_WIDTH + 7
endc
if "\1" == "west"
@@ -58,12 +58,12 @@ if "\1" == "west"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
- dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
+ dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3)
db \6
db \2_WIDTH
db (\4 - \5) * -2
db \2_WIDTH * 2 - 1
- dw OverworldMap + \2_WIDTH * 2 + 6
+ dw wOverworldMap + \2_WIDTH * 2 + 6
endc
if "\1" == "east"
@@ -75,12 +75,12 @@ if "\1" == "east"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5)
- dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
+ dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6
db \2_WIDTH
db (\4 - \5) * -2
db 0
- dw OverworldMap + \2_WIDTH + 7
+ dw wOverworldMap + \2_WIDTH + 7
endc
ENDM
diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm
index 2defde944..2eed7d98c 100644
--- a/data/phone/text/bill.asm
+++ b/data/phone/text/bill.asm
@@ -44,7 +44,7 @@ BillPhoneNotFullText: ; 0x1b452a
para "<PLAY_G>, your BOX"
line "has room for @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
cont "more #MON."
@@ -59,7 +59,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " more #MON."
para "Maybe you should"
diff --git a/data/phone/text/extra.asm b/data/phone/text/extra.asm
index c7c4c2dfb..b4ae1d0c5 100644
--- a/data/phone/text/extra.asm
+++ b/data/phone/text/extra.asm
@@ -310,7 +310,7 @@ UnknownText_0x648dc: ; 0x648dc
ArnieLovesTheCuteText: ; 0x649dc
text "I'm always with my"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "It's so cute!"
@@ -323,7 +323,7 @@ UnknownText_0x64a13: ; 0x64a13
line "here, I saw this"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " for the"
line "first time."
@@ -336,7 +336,7 @@ UnknownText_0x64a71: ; 0x64a71
text "I was wondering,"
line "do you happen to"
cont "have @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "?"
para "I can't seem to"
@@ -359,7 +359,7 @@ UnknownText_0x64ada: ; 0x64ada
para "I'll be here on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x64b48
@@ -376,12 +376,12 @@ UnknownText_0x64b5f: ; 0x64b5f
para "A whole bunch of"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " have"
para "appeared around"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
para "You have to see"
@@ -406,7 +406,7 @@ UnknownText_0x64c13: ; 0x64c13
para "Let's battle. I'll"
line "be waiting for you"
cont "on @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x64c5a
@@ -425,7 +425,7 @@ UnknownText_0x64c5a: ; 0x64c5a
AlanGettingStrongerText: ; 0x64cbd
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "getting stronger,"
@@ -439,7 +439,7 @@ UnknownText_0x64cf3: ; 0x64cf3
line "knocked out a wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " just"
line "the other day."
@@ -451,7 +451,7 @@ UnknownText_0x64cf3: ; 0x64cf3
UnknownText_0x64d4f: ; 0x64d4f
text "By the way, a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " escaped"
cont "on me yesterday."
@@ -469,7 +469,7 @@ UnknownText_0x64da4: ; 0x64da4
para "I'm hanging out on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Can you come down"
@@ -490,7 +490,7 @@ UnknownText_0x64e2f: ; 0x64e2f
line "Why don't you come"
para "to @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text_start
line "and pick it up?"
done
@@ -512,7 +512,7 @@ UnknownText_0x64ed4: ; 0x64ed4
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x64f1a
@@ -526,14 +526,14 @@ UnknownText_0x64f1a: ; 0x64f1a
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x64f74
UnknownText_0x64f74: ; 0x64f74
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "getting prettier!"
@@ -546,7 +546,7 @@ UnknownText_0x64fb2: ; 0x64fb2
text "It took only an"
line "instant to KO a"
cont "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "It must be because"
@@ -560,7 +560,7 @@ UnknownText_0x64fb2: ; 0x64fb2
UnknownText_0x6501c: ; 0x6501c
text "You know what?"
line "A wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "got away from me"
line "again."
@@ -576,7 +576,7 @@ UnknownText_0x6501c: ; 0x6501c
UnknownText_0x65091: ; 0x65091
text "Right now, I'm on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "If you're close"
@@ -604,7 +604,7 @@ UnknownText_0x650ec: ; 0x650ec
para "it! I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x65161
@@ -630,7 +630,7 @@ UnknownText_0x651bf: ; 0x651bf
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x6520f
@@ -646,7 +646,7 @@ UnknownText_0x6520f: ; 0x6520f
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x65271
@@ -655,7 +655,7 @@ ChadObservingWildText: ; 0x65271
text "I recently began"
line "observing wild"
cont "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "I've been learning"
@@ -677,7 +677,7 @@ UnknownText_0x65318: ; 0x65318
line "to knock out a"
para "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " a"
line "while back."
@@ -694,7 +694,7 @@ UnknownText_0x65399: ; 0x65399
line "close to catching"
para "a wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text ","
line "but it got away."
@@ -703,7 +703,7 @@ UnknownText_0x65399: ; 0x65399
para "wanting to observe"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text ". Rats…"
done
; 0x65419
@@ -717,7 +717,7 @@ UnknownText_0x65419: ; 0x65419
para "I'll be on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x65471
@@ -906,7 +906,7 @@ UnknownText_0x65a63: ; 0x65a63
para "The place is"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Hurry over--I'm"
@@ -917,7 +917,7 @@ UnknownText_0x65a63: ; 0x65a63
DerekCheekPincherText: ; 0x65ab2
text "Listen to this."
line "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "grins happily when"
line "I pinch its cheek."
@@ -933,11 +933,11 @@ UnknownText_0x65b29: ; 0x65b29
text "Oh, and recently,"
line "my PIKACHU beat a"
cont "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "A wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text ","
line "I tell you!"
@@ -955,7 +955,7 @@ UnknownText_0x65b29: ; 0x65b29
UnknownText_0x65bc8: ; 0x65bc8
text "Oh, and I saw a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " a"
cont "little while ago."
@@ -1020,7 +1020,7 @@ UnknownText_0x65da6: ; 0x65da6
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Come pick this up"
@@ -1030,7 +1030,7 @@ UnknownText_0x65da6: ; 0x65da6
TullyGrownText: ; 0x65de4
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " has"
line "grown again."
@@ -1045,7 +1045,7 @@ TullyGrownText: ; 0x65de4
UnknownText_0x65e42: ; 0x65e42
text "Oh yeah, I KO'd a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "It was huge, like"
@@ -1060,7 +1060,7 @@ UnknownText_0x65e42: ; 0x65e42
UnknownText_0x65eac: ; 0x65eac
text "Oh yeah, I lost a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "It was huge, like"
@@ -1078,7 +1078,7 @@ UnknownText_0x65f17: ; 0x65f17
para "I'll be fishing on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Swing by if you"
@@ -1102,7 +1102,7 @@ UnknownText_0x65f88: ; 0x65f88
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x65ff2
@@ -1126,7 +1126,7 @@ UnknownText_0x66043: ; 0x66043
para "Our battle will be"
line "on @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x66087
@@ -1137,7 +1137,7 @@ UnknownText_0x66087: ; 0x66087
para "Hustle over to"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x660be
@@ -1162,7 +1162,7 @@ UnknownText_0x6613c: ; 0x6613c
line "down this wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
line "It wasn't rare"
@@ -1202,7 +1202,7 @@ UnknownText_0x66214: ; 0x66214
para "You know where--"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x662a9
@@ -1318,14 +1318,14 @@ UnknownText_0x66579: ; 0x66579
para "Hurry over to"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x665ad
UnknownText_0x665ad: ; 0x665ad
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "adorable, don't"
@@ -1342,7 +1342,7 @@ UnknownText_0x66605: ; 0x66605
line "battle a wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " a while"
line "ago…"
@@ -1353,7 +1353,7 @@ UnknownText_0x66605: ; 0x66605
para "I hate those nasty"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
done
; 0x66688
@@ -1363,7 +1363,7 @@ UnknownText_0x66688: ; 0x66688
line "battle a wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " a while"
line "ago…"
@@ -1389,13 +1389,13 @@ UnknownText_0x66730: ; 0x66730
para "I'll be waiting"
line "with CLEFAIRY on"
cont "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x66796
TiffanyItsAwfulText: ; 0x66796
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "It's awful."
@@ -1428,7 +1428,7 @@ UnknownText_0x66801: ; 0x66801
para "Come collect it on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x66882
@@ -1451,7 +1451,7 @@ UnknownText_0x668a3: ; 0x668a3
para "Please hurry to"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x6691d
@@ -1466,14 +1466,14 @@ UnknownText_0x6691d: ; 0x6691d
para "Please hurry to"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x66980
VanceLiftoffText: ; 0x66980
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "become tougher."
@@ -1485,7 +1485,7 @@ VanceLiftoffText: ; 0x66980
UnknownText_0x669b2: ; 0x669b2
text "We can easily beat"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "…Huh? You too?"
@@ -1496,7 +1496,7 @@ UnknownText_0x669b2: ; 0x669b2
UnknownText_0x669ed: ; 0x669ed
text "But get this, a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "just barely eluded"
line "us."
@@ -1509,7 +1509,7 @@ UnknownText_0x669ed: ; 0x669ed
UnknownText_0x66a3a: ; 0x66a3a
text "Right now, I'm on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "You know, where I"
@@ -1537,7 +1537,7 @@ VanceHurryHurryText: ; 0x66ad1
line "Hurry, hurry!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
line "FLY over now!"
done
@@ -1545,7 +1545,7 @@ VanceHurryHurryText: ; 0x66ad1
WiltonGrownText: ; 0x66afc
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "grown impressive!"
@@ -1557,7 +1557,7 @@ WiltonGrownText: ; 0x66afc
UnknownText_0x66b3e: ; 0x66b3e
text "We beat a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "…"
para "You know, I have"
@@ -1574,7 +1574,7 @@ UnknownText_0x66b8f: ; 0x66b8f
para "to landing a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "I tell you, it was"
@@ -1585,7 +1585,7 @@ UnknownText_0x66b8f: ; 0x66b8f
UnknownText_0x66bf3: ; 0x66bf3
text "I'm fishing on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text ","
para "but nothing's"
@@ -1608,7 +1608,7 @@ UnknownText_0x66c6b: ; 0x66c6b
para "Come pick it up on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x66ca7
@@ -1631,7 +1631,7 @@ WiltonNotBitingText: ; 0x66cf7
para "like before on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "…"
para "You have to come"
@@ -1647,7 +1647,7 @@ WiltonWantThisText: ; 0x66d45
line "know where?"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "…"
line "Just head from"
@@ -1730,7 +1730,7 @@ UnknownText_0x66f52: ; 0x66f52
ParryNoMatchText: ; 0x66f9f
text "Nothing can match"
line "my @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " now."
done
; 0x66fc0
@@ -1738,7 +1738,7 @@ ParryNoMatchText: ; 0x66f9f
UnknownText_0x66fc0: ; 0x66fc0
text "Yeah, we KO'd a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "That was OK, but I"
@@ -1751,7 +1751,7 @@ UnknownText_0x67001: ; 0x67001
line "spotted a wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
line "We were debating"
@@ -1775,7 +1775,7 @@ UnknownText_0x67096: ; 0x67096
para "Yep! We'll meet on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x670eb
@@ -1795,7 +1795,7 @@ ParryBattleWithMeText: ; 0x67106
ParryHaventYouGottenToText: ; 0x6712a
text "Haven't you gotten"
line "to @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "?"
para "Waiting here isn't"
@@ -1805,9 +1805,9 @@ ParryHaventYouGottenToText: ; 0x6712a
; 0x6717a
UnknownText_0x6717a: ; 0x6717a
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "'s @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "is much stronger"
cont "than before!"
@@ -1818,7 +1818,7 @@ UnknownText_0x671a4: ; 0x671a4
text "And, and…"
line "I just battled and"
cont "beat @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "I've raised my"
@@ -1830,7 +1830,7 @@ UnknownText_0x671eb: ; 0x671eb
text "But, but…"
para "A wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "got away from me"
@@ -1848,7 +1848,7 @@ UnknownText_0x6722e: ; 0x6722e
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x67281
@@ -1874,7 +1874,7 @@ ErinComeBattleText: ; 0x672d5
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x67308
diff --git a/data/phone/text/extra2.asm b/data/phone/text/extra2.asm
index f53c0ba25..887353536 100644
--- a/data/phone/text/extra2.asm
+++ b/data/phone/text/extra2.asm
@@ -21,7 +21,7 @@ UnknownText_0x174000: ; 0x174000
JackIntelligenceText: ; 0x1740c0
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "intelligence keeps"
@@ -35,7 +35,7 @@ JackDefeatedMonText: ; 0x174106
text "The other day, I"
line "easily defeated a"
cont "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "I think swapping"
@@ -49,7 +49,7 @@ UnknownText_0x174165: ; 0x174165
line "I missed catching"
para "a @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " by"
line "just a tiny bit."
@@ -70,7 +70,7 @@ UnknownText_0x1741e1: ; 0x1741e1
para "I'll be in"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Give me a shout if"
@@ -226,7 +226,7 @@ UnknownText_0x174638: ; 0x174638
para "I'll be at"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x174688
@@ -234,7 +234,7 @@ UnknownText_0x174638: ; 0x174638
UnknownText_0x174688: ; 0x174688
text "I fancied up my"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and"
para "made it even cuter"
@@ -266,7 +266,7 @@ UnknownText_0x174734: ; 0x174734
line "showed it was"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text ". I was"
line "quite miffed."
done
@@ -290,7 +290,7 @@ BeverlyFoundNuggetText: ; 0x1747cc
para "I'll be at"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Please come see me"
@@ -315,7 +315,7 @@ UnknownText_0x174895: ; 0x174895
line "hurry. Come see me"
para "in @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text_start
line "when you can."
done
@@ -329,7 +329,7 @@ UnknownText_0x1748ea: ; 0x1748ea
line "last time!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "'s"
line "where I'm waiting"
@@ -361,7 +361,7 @@ UnknownText_0x1749c7: ; 0x1749c7
cont "about our battle!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
para "Hustle over quick!"
@@ -371,14 +371,14 @@ UnknownText_0x1749c7: ; 0x1749c7
GavenGreaterText: ; 0x174a24
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "might be greater"
cont "than I imagined."
para "I doubt I'll see a"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " that's"
cont "better than mine."
done
@@ -389,13 +389,13 @@ UnknownText_0x174a80: ; 0x174a80
line "to barely defeat"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " the"
line "other day."
para "I've never seen a"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " get"
cont "that strong…"
@@ -412,7 +412,7 @@ UnknownText_0x174b2d: ; 0x174b2d
text "And a while back,"
line "I tried to catch a"
cont "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "But it managed to"
@@ -431,7 +431,7 @@ UnknownText_0x174bc5: ; 0x174bc5
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Give me a shout"
@@ -457,7 +457,7 @@ UnknownText_0x174c49: ; 0x174c49
para "I'll take you down"
line "with @"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x174c7f
@@ -465,11 +465,11 @@ UnknownText_0x174c49: ; 0x174c49
UnknownText_0x174c7f: ; 0x174c7f
text "Do you remember my"
line "sweet @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "?"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " runs"
line "very fast."
@@ -484,7 +484,7 @@ UnknownText_0x174c7f: ; 0x174c7f
UnknownText_0x174cf6: ; 0x174cf6
text "Oh, have you ever"
line "seen a @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
cont "before?"
@@ -505,7 +505,7 @@ UnknownText_0x174cf6: ; 0x174cf6
UnknownText_0x174d86: ; 0x174d86
text "Oh, I just saw a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "I was trying to"
@@ -535,7 +535,7 @@ UnknownText_0x174e4e: ; 0x174e4e
line "for you around"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
line "Look for me, OK?"
done
@@ -560,7 +560,7 @@ BethForgetDealText: ; 0x174ee2
line "deal?"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "That's where I'm"
@@ -571,7 +571,7 @@ BethForgetDealText: ; 0x174ee2
JoseAromaText: ; 0x174f2f
text "Hey listen, my"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s stick"
para "has this really"
@@ -586,7 +586,7 @@ UnknownText_0x174f90: ; 0x174f90
text "A while ago, my"
line "FARFETCH'D KO'd"
cont "this @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "You should have"
@@ -600,7 +600,7 @@ UnknownText_0x174f90: ; 0x174f90
UnknownText_0x174ffd: ; 0x174ffd
text "I ran into a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "…"
para "I was trying to"
@@ -625,7 +625,7 @@ UnknownText_0x17507d: ; 0x17507d
line "raring to go."
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "'s"
line "where I'm at."
@@ -649,7 +649,7 @@ JoseFoundSomethingText: ; 0x175116
para "Catch up to me on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text ","
para "and I'll let you"
@@ -684,7 +684,7 @@ UnknownText_0x17520a: ; 0x17520a
line "stick!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
para "Please come as"
@@ -700,7 +700,7 @@ UnknownText_0x17529c: ; 0x17529c
para "Catch up to me on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text ","
para "and I'll let you"
@@ -713,12 +713,12 @@ UnknownText_0x1752f5: ; 0x1752f5
para "Do you recall my"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "?"
para "Yes, exactly. That"
line "lovely @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "Wouldn't you agree"
@@ -730,13 +730,13 @@ UnknownText_0x1752f5: ; 0x1752f5
UnknownText_0x17536b: ; 0x17536b
text "Have I ever faced"
line "a wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "?"
para "You need to ask?"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " I've"
line "beaten on numerous"
cont "occasions!"
@@ -754,7 +754,7 @@ UnknownText_0x1753c5: ; 0x1753c5
line "to catch a wild"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "…"
line "Oh! Never mind!"
done
@@ -766,7 +766,7 @@ UnknownText_0x17543a: ; 0x17543a
para "The place shall be"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
para "Don't make me"
@@ -798,7 +798,7 @@ UnknownText_0x1754e5: ; 0x1754e5
line "the place was"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
line "Don't try to run!"
done
@@ -806,7 +806,7 @@ UnknownText_0x1754e5: ; 0x1754e5
JoeySharperText: ; 0x175530
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "looking sharper"
cont "than before!"
@@ -822,7 +822,7 @@ JoeySharperText: ; 0x175530
UnknownText_0x175591: ; 0x175591
text "Oh yeah, I took"
line "down a @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "in the wild the"
line "other day."
@@ -838,7 +838,7 @@ UnknownText_0x175591: ; 0x175591
UnknownText_0x175611: ; 0x175611
text "Oh yeah, I saw a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "I thought about"
@@ -860,7 +860,7 @@ UnknownText_0x175693: ; 0x175693
line "will be different!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "'s"
line "where I'll be."
@@ -877,7 +877,7 @@ UnknownText_0x17570a: ; 0x17570a
UnknownText_0x17571d: ; 0x17571d
text "I'm checking out"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s moves"
para "and devising some"
@@ -898,7 +898,7 @@ UnknownText_0x175786: ; 0x175786
para "I'm waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x1757d4
@@ -914,7 +914,7 @@ WadeAreYouGrowingText: ; 0x1757d4
line "It's overwhelming!"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s grow-"
line "ing especially"
@@ -926,7 +926,7 @@ WadeAreYouGrowingText: ; 0x1757d4
UnknownText_0x175869: ; 0x175869
text "Oh yeah, we KO'd a"
line "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "with one hit a"
line "while back."
@@ -942,7 +942,7 @@ UnknownText_0x175869: ; 0x175869
UnknownText_0x1758e4: ; 0x1758e4
text "Oh yeah, a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " got"
para "away from me at"
@@ -967,7 +967,7 @@ UnknownText_0x175976: ; 0x175976
line "last time!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "'s"
line "where I'll be."
@@ -1005,7 +1005,7 @@ WadeFoundBerryText: ; 0x175a60
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x175abe
@@ -1027,7 +1027,7 @@ UnknownText_0x175b1e: ; 0x175b1e
line "already!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text " is"
line "where I am."
@@ -1041,7 +1041,7 @@ UnknownText_0x175b6d: ; 0x175b6d
line "not here yet?"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text " is"
line "where I am."
@@ -1055,7 +1055,7 @@ RalphNeglectingKidsText: ; 0x175bc4
line "more time with my"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " than I"
line "have with my kids."
@@ -1067,7 +1067,7 @@ RalphNeglectingKidsText: ; 0x175bc4
UnknownText_0x175c24: ; 0x175c24
text "I just beat a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "I told my kid, but"
@@ -1084,7 +1084,7 @@ UnknownText_0x175c24: ; 0x175c24
UnknownText_0x175c9f: ; 0x175c9f
text "Yesterday a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " slipped"
para "away from me, in"
@@ -1112,7 +1112,7 @@ UnknownText_0x175d40: ; 0x175d40
line "quite agreeable."
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text " is"
line "the spot!"
done
@@ -1129,7 +1129,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "Uh, sorry! See,"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " are"
para "biting like there"
@@ -1137,7 +1137,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "over here on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
para "Aiyee! Ouch!"
@@ -1172,7 +1172,7 @@ UnknownText_0x175f11: ; 0x175f11
para "you to show up on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "You shouldn't make"
@@ -1198,7 +1198,7 @@ UnknownText_0x175fda: ; 0x175fda
line "hear this."
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "so adorable!"
@@ -1212,7 +1212,7 @@ UnknownText_0x17602d: ; 0x17602d
para "We beat a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " with"
para "just one hit a"
@@ -1229,7 +1229,7 @@ UnknownText_0x176095: ; 0x176095
para "We just saw a"
line "really gorgeous"
cont "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "But I was on the"
@@ -1252,7 +1252,7 @@ UnknownText_0x17610a: ; 0x17610a
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "Let me know when"
@@ -1450,13 +1450,13 @@ UnknownText_0x176816: ; 0x176816
para "I saw a beautiful"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
para "I wish I could"
line "become a beautiful"
cont "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " too."
done
; 0x17686d
@@ -1475,7 +1475,7 @@ UnknownText_0x1768b0: ; 0x1768b0
text "Listen, listen!"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "…"
line "it… so pretty…"
@@ -1515,7 +1515,7 @@ UnknownText_0x1769da: ; 0x1769da
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x176a2f
@@ -1525,7 +1525,7 @@ AnthonyAteBerriesText: ; 0x176a2f
line "was watching my"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " eat"
line "some BERRIES."
@@ -1548,7 +1548,7 @@ UnknownText_0x176aef: ; 0x176aef
line "running across"
para "wild @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "quite often."
@@ -1562,7 +1562,7 @@ UnknownText_0x176b45: ; 0x176b45
line "battling this"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " the"
line "other day…"
@@ -1583,7 +1583,7 @@ UnknownText_0x176bee: ; 0x176bee
line "battle right now!"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text " is"
line "where I am."
@@ -1604,20 +1604,20 @@ UnknownText_0x176c61: ; 0x176c61
para "I took a hike in"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text_start
cont "yesterday, see?"
para "Well, there were"
line "tons of @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "around! You have"
line "to see it!"
para "I get this feeling"
line "that @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "may be timid."
line "I didn't see any"
@@ -1646,7 +1646,7 @@ UnknownText_0x176d85: ; 0x176d85
line "you?"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
line "I'm waiting!"
done
@@ -1671,7 +1671,7 @@ UnknownText_0x176dd1: ; 0x176dd1
ToddLooksCuteLikeMeText: ; 0x176e5d
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "looking more and"
@@ -1685,7 +1685,7 @@ UnknownText_0x176e9c: ; 0x176e9c
para "Now we can KO"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " easily."
para "I should challenge"
@@ -1698,7 +1698,7 @@ UnknownText_0x176eee: ; 0x176eee
line "We just failed to"
para "beat @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " by"
line "a tiny margin."
@@ -1722,7 +1722,7 @@ UnknownText_0x176f60: ; 0x176f60
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x176fdb
@@ -1776,7 +1776,7 @@ UnknownText_0x177138: ; 0x177138
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
done
; 0x17717c
@@ -1798,7 +1798,7 @@ UnknownText_0x17717c: ; 0x17717c
UnknownText_0x1771fd: ; 0x1771fd
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and"
line "I are getting more"
@@ -1810,7 +1810,7 @@ UnknownText_0x1771fd: ; 0x1771fd
UnknownText_0x177237: ; 0x177237
text "We battled a wild"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and"
para "managed to drop it"
@@ -1826,7 +1826,7 @@ UnknownText_0x177297: ; 0x177297
para "I still haven't"
line "caught @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
para "It's getting past"
@@ -1841,7 +1841,7 @@ UnknownText_0x1772e2: ; 0x1772e2
para "I'll be waiting on"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "."
para "…Could you take it"
@@ -1880,7 +1880,7 @@ UnknownText_0x1773e7: ; 0x1773e7
line "it, won't you?"
para "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text " is"
line "where I am."
done
@@ -1907,7 +1907,7 @@ UnknownText_0x1774c1: ; 0x1774c1
para "Don't forget,"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x17750e
@@ -1921,7 +1921,7 @@ UnknownText_0x17750e: ; 0x17750e
para "Hurry over to"
line "@"
- text_from_ram StringBuffer5
+ text_from_ram wStringBuffer5
text "!"
done
; 0x177561
diff --git a/data/phone/text/gaven_overworld.asm b/data/phone/text/gaven_overworld.asm
index 501aa0e79..a43c4080b 100644
--- a/data/phone/text/gaven_overworld.asm
+++ b/data/phone/text/gaven_overworld.asm
@@ -12,7 +12,7 @@ GavenAskNumber1Text:
line "again when I heal"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and the"
line "rest of my team."
done
@@ -25,7 +25,7 @@ GavenAskNumber2Text:
line "again when I heal"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and the"
line "rest of my team."
done
diff --git a/data/phone/text/jose_overworld.asm b/data/phone/text/jose_overworld.asm
index b266f18cd..e57e78a9e 100644
--- a/data/phone/text/jose_overworld.asm
+++ b/data/phone/text/jose_overworld.asm
@@ -1,6 +1,6 @@
JoseAskNumber1Text:
text "If my @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "sees anything"
diff --git a/data/phone/text/mom.asm b/data/phone/text/mom.asm
index da7df47de..ddec4cf77 100644
--- a/data/phone/text/mom.asm
+++ b/data/phone/text/mom.asm
@@ -8,12 +8,12 @@ MomPhoneGreetingText: ; 0x1b4000
MomPhoneLandmarkText: ; 0x1b4021
text "Oh, so you're in"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Isn't that where"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "is? Did you go"
line "take a look?"
@@ -22,7 +22,7 @@ MomPhoneLandmarkText: ; 0x1b4021
MomPhoneGenericAreaText: ; 0x1b406b
text "Really, you're in"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
para "I've never gone"
@@ -33,7 +33,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
MomPhoneNewBarkText: ; 0x1b40b1
text "What? You're in"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
para "Come see your MOM"
@@ -43,7 +43,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
MomPhoneCherrygroveText: ; 0x1b40e4
text "You're visiting"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
para "How about coming"
@@ -53,7 +53,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
MomOtherAreaText: ; 0x1b411c
text "Wow, you're in"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "?"
para "Good luck on your"
@@ -74,7 +74,7 @@ MomDeterminedText: ; 0x1b4150
MomCheckBalanceText: ; 0x1b41a7
text "By the way, you've"
line "saved up ¥@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Do you want to"
@@ -97,7 +97,7 @@ MomYoureNotSavingText: ; 0x1b420d
MomYouveSavedText: ; 0x1b4249
text "By the way, you've"
line "saved up ¥@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Want to start"
diff --git a/data/phone/text/trainers1.asm b/data/phone/text/trainers1.asm
index 8768b9295..e5dcccddf 100644
--- a/data/phone/text/trainers1.asm
+++ b/data/phone/text/trainers1.asm
@@ -1,7 +1,7 @@
UnknownText_0x1b4dc5: ; 0x1b4dc5
text "Hello. This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Good morning,"
@@ -11,7 +11,7 @@ UnknownText_0x1b4dc5: ; 0x1b4dc5
UnknownText_0x1b4ded: ; 0x1b4ded
text "Hello. This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "How's it going,"
@@ -21,7 +21,7 @@ UnknownText_0x1b4ded: ; 0x1b4ded
UnknownText_0x1b4e16: ; 0x1b4e16
text "Hello. This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Good evening,"
@@ -33,7 +33,7 @@ UnknownText_0x1b4e3e: ; 0x1b4e3e
line "morning!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -42,7 +42,7 @@ UnknownText_0x1b4e72: ; 0x1b4e72
text "<PLAY_G>, howdy!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -52,7 +52,7 @@ UnknownText_0x1b4e9e: ; 0x1b4e9e
line "evening!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Got a minute?"
done
@@ -62,7 +62,7 @@ UnknownText_0x1b4ecd: ; 0x1b4ecd
line "#MON doing?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "so curious, it's a"
@@ -73,7 +73,7 @@ UnknownText_0x1b4ecd: ; 0x1b4ecd
UnknownText_0x1b4f21: ; 0x1b4f21
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh! Good morning,"
@@ -83,7 +83,7 @@ UnknownText_0x1b4f21: ; 0x1b4f21
UnknownText_0x1b4f4d: ; 0x1b4f4d
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh! Good day,"
@@ -93,7 +93,7 @@ UnknownText_0x1b4f4d: ; 0x1b4f4d
UnknownText_0x1b4f75: ; 0x1b4f75
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh! Good evening,"
@@ -105,7 +105,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1
line "Good morning."
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Were you asleep?"
done
@@ -113,7 +113,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1
UnknownText_0x1b4fda: ; 0x1b4fda
text "Hi, <PLAYER>."
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "How are you doing?"
@@ -122,7 +122,7 @@ UnknownText_0x1b4fda: ; 0x1b4fda
UnknownText_0x1b5004: ; 0x1b5004
text "Hi, <PLAYER>."
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Were you awake?"
@@ -133,7 +133,7 @@ UnknownText_0x1b502b: ; 0x1b502b
line "#MON happy?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "healthy. It eats a"
cont "lot every day."
@@ -142,7 +142,7 @@ UnknownText_0x1b502b: ; 0x1b502b
UnknownText_0x1b5073: ; 0x1b5073
text "Yeah, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Huh? What's up,"
@@ -152,7 +152,7 @@ UnknownText_0x1b5073: ; 0x1b5073
UnknownText_0x1b509b: ; 0x1b509b
text "Yeah, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Huh? What's up"
@@ -162,7 +162,7 @@ UnknownText_0x1b509b: ; 0x1b509b
UnknownText_0x1b50c2: ; 0x1b50c2
text "Yeah, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Huh? What's up"
@@ -174,7 +174,7 @@ UnknownText_0x1b50e9: ; 0x1b50e9
line "You awake?"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -184,7 +184,7 @@ UnknownText_0x1b511a: ; 0x1b511a
line "free right now?"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -194,7 +194,7 @@ UnknownText_0x1b5154: ; 0x1b5154
line "Were you asleep?"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "How's it going?"
done
@@ -207,7 +207,7 @@ UnknownText_0x1b518b: ; 0x1b518b
line "bit too energetic."
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text ","
line "especially."
@@ -221,7 +221,7 @@ UnknownText_0x1b518b: ; 0x1b518b
UnknownText_0x1b522b: ; 0x1b522b
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "looking tougher"
cont "than ever."
@@ -233,7 +233,7 @@ UnknownText_0x1b522b: ; 0x1b522b
UnknownText_0x1b5270: ; 0x1b5270
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -243,7 +243,7 @@ UnknownText_0x1b5270: ; 0x1b5270
UnknownText_0x1b52a5: ; 0x1b52a5
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -252,7 +252,7 @@ UnknownText_0x1b52a5: ; 0x1b52a5
UnknownText_0x1b52cc: ; 0x1b52cc
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking…"
para "Hi, <PLAY_G>!"
@@ -264,7 +264,7 @@ UnknownText_0x1b5301: ; 0x1b5301
line "morning!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -273,7 +273,7 @@ UnknownText_0x1b5335: ; 0x1b5335
text "Hi, <PLAY_G>!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -283,7 +283,7 @@ UnknownText_0x1b535f: ; 0x1b535f
line "evening!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you doing?"
done
@@ -293,7 +293,7 @@ UnknownText_0x1b5393: ; 0x1b5393
line "#MON doing?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "doing as great as"
cont "ever."
@@ -306,7 +306,7 @@ UnknownText_0x1b5393: ; 0x1b5393
UnknownText_0x1b53f7: ; 0x1b53f7
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -318,7 +318,7 @@ UnknownText_0x1b53f7: ; 0x1b53f7
UnknownText_0x1b5424: ; 0x1b5424
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh. Hi, <PLAY_G>."
@@ -327,7 +327,7 @@ UnknownText_0x1b5424: ; 0x1b5424
UnknownText_0x1b5446: ; 0x1b5446
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -339,7 +339,7 @@ UnknownText_0x1b5472: ; 0x1b5472
line "<PLAY_G>!"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Were you sleeping?"
done
@@ -347,7 +347,7 @@ UnknownText_0x1b5472: ; 0x1b5472
UnknownText_0x1b54a6: ; 0x1b54a6
text "<PLAY_G>, hi!"
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Do you have some"
@@ -359,7 +359,7 @@ UnknownText_0x1b54d4: ; 0x1b54d4
line "Good evening."
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "I hope you were"
@@ -386,7 +386,7 @@ UnknownText_0x1b5510: ; 0x1b5510
UnknownText_0x1b55ae: ; 0x1b55ae
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>?"
@@ -396,7 +396,7 @@ UnknownText_0x1b55ae: ; 0x1b55ae
UnknownText_0x1b55da: ; 0x1b55da
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>? Hi!"
@@ -405,7 +405,7 @@ UnknownText_0x1b55da: ; 0x1b55da
UnknownText_0x1b55fc: ; 0x1b55fc
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>?"
@@ -417,7 +417,7 @@ UnknownText_0x1b5628: ; 0x1b5628
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -426,7 +426,7 @@ UnknownText_0x1b564c: ; 0x1b564c
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -435,7 +435,7 @@ UnknownText_0x1b5670: ; 0x1b5670
para "Tweet! Yeah, it's"
line "me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -444,7 +444,7 @@ UnknownText_0x1b5694: ; 0x1b5694
line "still cooking?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " has"
line "too much energy."
@@ -456,7 +456,7 @@ UnknownText_0x1b5694: ; 0x1b5694
UnknownText_0x1b5702: ; 0x1b5702
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh. Hi, <PLAYER>."
@@ -466,7 +466,7 @@ UnknownText_0x1b5702: ; 0x1b5702
UnknownText_0x1b572e: ; 0x1b572e
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAYER>,"
@@ -476,7 +476,7 @@ UnknownText_0x1b572e: ; 0x1b572e
UnknownText_0x1b575a: ; 0x1b575a
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAYER>,"
@@ -488,7 +488,7 @@ UnknownText_0x1b5786: ; 0x1b5786
line "up and answer!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -497,7 +497,7 @@ UnknownText_0x1b57b7: ; 0x1b57b7
line "up and answer!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -506,7 +506,7 @@ UnknownText_0x1b57e8: ; 0x1b57e8
line "up and answer!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -528,7 +528,7 @@ UnknownText_0x1b5819: ; 0x1b5819
UnknownText_0x1b589a: ; 0x1b589a
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -537,7 +537,7 @@ UnknownText_0x1b589a: ; 0x1b589a
UnknownText_0x1b58c2: ; 0x1b58c2
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -546,7 +546,7 @@ UnknownText_0x1b58c2: ; 0x1b58c2
UnknownText_0x1b58ea: ; 0x1b58ea
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Oh, <PLAYER>? You"
@@ -558,7 +558,7 @@ UnknownText_0x1b5912: ; 0x1b5912
line "How're you doing?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ","
line "got a minute?"
done
@@ -568,7 +568,7 @@ UnknownText_0x1b5948: ; 0x1b5948
line "it going?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Got a minute?"
done
@@ -578,7 +578,7 @@ UnknownText_0x1b597c: ; 0x1b597c
line "How're you doing?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ","
line "got a minute?"
done
@@ -588,7 +588,7 @@ UnknownText_0x1b59b2: ; 0x1b59b2
line "#MON doing?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "'s"
line "raring to go, just"
cont "like always."
@@ -603,7 +603,7 @@ UnknownText_0x1b59b2: ; 0x1b59b2
UnknownText_0x1b5a3b: ; 0x1b5a3b
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "Oh. Hi, <PLAY_G>!"
@@ -613,7 +613,7 @@ UnknownText_0x1b5a3b: ; 0x1b5a3b
UnknownText_0x1b5a74: ; 0x1b5a74
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "Oh, hi, <PLAY_G>!"
@@ -622,7 +622,7 @@ UnknownText_0x1b5a74: ; 0x1b5a74
UnknownText_0x1b5a9f: ; 0x1b5a9f
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "Oh, hi, <PLAY_G>!"
@@ -634,7 +634,7 @@ UnknownText_0x1b5ad8: ; 0x1b5ad8
line "morning!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -643,7 +643,7 @@ UnknownText_0x1b5b0b: ; 0x1b5b0b
text "<PLAY_G>, howdy!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Isn't it nice out?"
done
@@ -653,7 +653,7 @@ UnknownText_0x1b5b37: ; 0x1b5b37
line "<PLAY_G>!"
para "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Were you awake?"
done
@@ -670,7 +670,7 @@ UnknownText_0x1b5b68: ; 0x1b5b68
para "Of all my #MON,"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is the"
cont "hardest to handle."
@@ -711,21 +711,21 @@ UnknownText_0x1b5cb6: ; 0x1b5cb6
UnknownText_0x1b5d09: ; 0x1b5d09
text "Hiya, it's Uncle"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
UnknownText_0x1b5d21: ; 0x1b5d21
text "Hiya, it's Uncle"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
UnknownText_0x1b5d39: ; 0x1b5d39
text "Hiya, it's Uncle"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -740,7 +740,7 @@ UnknownText_0x1b5d51: ; 0x1b5d51
UnknownText_0x1b5d9f: ; 0x1b5d9f
text "Hello, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "speaking."
@@ -750,7 +750,7 @@ UnknownText_0x1b5d9f: ; 0x1b5d9f
UnknownText_0x1b5dcc: ; 0x1b5dcc
text "Hello, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "speaking."
@@ -760,7 +760,7 @@ UnknownText_0x1b5dcc: ; 0x1b5dcc
UnknownText_0x1b5df8: ; 0x1b5df8
text "Hello, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "speaking."
@@ -773,7 +773,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25
line "<PLAY_G>."
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Were you sleeping?"
done
@@ -781,7 +781,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25
UnknownText_0x1b5e59: ; 0x1b5e59
text "Hi, <PLAY_G>."
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "How are things"
@@ -793,7 +793,7 @@ UnknownText_0x1b5e8e: ; 0x1b5e8e
line "<PLAY_G>."
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Are you awake?"
done
@@ -807,7 +807,7 @@ UnknownText_0x1b5ebe: ; 0x1b5ebe
para "Me, I take my"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " to the"
para "#MON CENTER in"
@@ -822,7 +822,7 @@ UnknownText_0x1b5ebe: ; 0x1b5ebe
UnknownText_0x1b5f7a: ; 0x1b5f7a
text "Yeah, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -831,7 +831,7 @@ UnknownText_0x1b5f7a: ; 0x1b5f7a
UnknownText_0x1b5f9e: ; 0x1b5f9e
text "Yeah, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -841,7 +841,7 @@ UnknownText_0x1b5f9e: ; 0x1b5f9e
UnknownText_0x1b5fc9: ; 0x1b5fc9
text "Yeah, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " the"
line "HIKER here."
@@ -853,7 +853,7 @@ UnknownText_0x1b5ff6: ; 0x1b5ff6
text "Yo, <PLAYER>?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -863,7 +863,7 @@ UnknownText_0x1b6017: ; 0x1b6017
line "<PLAYER>?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -873,7 +873,7 @@ UnknownText_0x1b6041: ; 0x1b6041
line "awake?"
para "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "the HIKER!"
done
@@ -883,7 +883,7 @@ UnknownText_0x1b606f: ; 0x1b606f
line "as feisty as ever?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and"
line "me--we have energy"
@@ -897,7 +897,7 @@ UnknownText_0x1b606f: ; 0x1b606f
UnknownText_0x1b60f5: ; 0x1b60f5
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "Hey, <PLAY_G>!"
@@ -906,7 +906,7 @@ UnknownText_0x1b60f5: ; 0x1b60f5
UnknownText_0x1b611b: ; 0x1b611b
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "This must be"
@@ -916,7 +916,7 @@ UnknownText_0x1b611b: ; 0x1b611b
UnknownText_0x1b6149: ; 0x1b6149
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " speaking."
para "Ah, <PLAY_G>!"
@@ -925,7 +925,7 @@ UnknownText_0x1b6149: ; 0x1b6149
UnknownText_0x1b616e: ; 0x1b616e
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "<PLAY_G>, right?"
@@ -934,7 +934,7 @@ UnknownText_0x1b616e: ; 0x1b616e
UnknownText_0x1b618f: ; 0x1b618f
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "<PLAY_G>, what are"
@@ -944,7 +944,7 @@ UnknownText_0x1b618f: ; 0x1b618f
UnknownText_0x1b61bd: ; 0x1b61bd
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "<PLAY_G>, sorry to"
@@ -968,7 +968,7 @@ UnknownText_0x1b61f2: ; 0x1b61f2
UnknownText_0x1b626a: ; 0x1b626a
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -978,7 +978,7 @@ UnknownText_0x1b626a: ; 0x1b626a
UnknownText_0x1b6296: ; 0x1b6296
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -988,7 +988,7 @@ UnknownText_0x1b6296: ; 0x1b6296
UnknownText_0x1b62c5: ; 0x1b62c5
text "Hello? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, <PLAY_G>!"
@@ -999,7 +999,7 @@ UnknownText_0x1b62f1: ; 0x1b62f1
text "<PLAY_G>?"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Good morning!"
done
@@ -1008,7 +1008,7 @@ UnknownText_0x1b630e: ; 0x1b630e
text "<PLAY_G>?"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ". Is"
line "this a bad time?"
done
@@ -1017,7 +1017,7 @@ UnknownText_0x1b6331: ; 0x1b6331
text "<PLAY_G>?"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "Got time to chat?"
done
@@ -1028,13 +1028,13 @@ UnknownText_0x1b6352: ; 0x1b6352
para "I train every day"
line "with @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
done
UnknownText_0x1b638c: ; 0x1b638c
text "Hello? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "here…"
@@ -1043,7 +1043,7 @@ UnknownText_0x1b638c: ; 0x1b638c
UnknownText_0x1b63a8: ; 0x1b63a8
text "Hello? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "here…"
@@ -1052,7 +1052,7 @@ UnknownText_0x1b63a8: ; 0x1b63a8
UnknownText_0x1b63c4: ; 0x1b63c4
text "Hello? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "here…"
@@ -1065,7 +1065,7 @@ UnknownText_0x1b63e3: ; 0x1b63e3
para "It's your pal,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1075,7 +1075,7 @@ UnknownText_0x1b6407: ; 0x1b6407
para "It's your buddy"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1085,14 +1085,14 @@ UnknownText_0x1b642c: ; 0x1b642c
para "It's your sidekick"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6454: ; 0x1b6454
text "Yeah, hello."
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1101,7 +1101,7 @@ UnknownText_0x1b6454: ; 0x1b6454
UnknownText_0x1b647e: ; 0x1b647e
text "Yeah, hello, you"
line "got @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1110,7 +1110,7 @@ UnknownText_0x1b647e: ; 0x1b647e
UnknownText_0x1b64a8: ; 0x1b64a8
text "Yeah, hello, you"
line "got @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "…Huh, <PLAY_G>? Yo!"
@@ -1119,7 +1119,7 @@ UnknownText_0x1b64a8: ; 0x1b64a8
UnknownText_0x1b64d2: ; 0x1b64d2
text "Yeah, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " calling."
para "What are you up"
@@ -1129,7 +1129,7 @@ UnknownText_0x1b64d2: ; 0x1b64d2
UnknownText_0x1b6506: ; 0x1b6506
text "Yeah, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " calling."
para "Where are you now,"
@@ -1139,7 +1139,7 @@ UnknownText_0x1b6506: ; 0x1b6506
UnknownText_0x1b6539: ; 0x1b6539
text "Yeah, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " calling."
para "Are you awake now,"
@@ -1154,7 +1154,7 @@ UnknownText_0x1b656c: ; 0x1b656c
UnknownText_0x1b659d: ; 0x1b659d
text "Yup, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Is this <PLAY_G>?"
@@ -1163,7 +1163,7 @@ UnknownText_0x1b659d: ; 0x1b659d
UnknownText_0x1b65c7: ; 0x1b65c7
text "Yup, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Is that <PLAY_G>?"
@@ -1171,7 +1171,7 @@ UnknownText_0x1b65c7: ; 0x1b65c7
UnknownText_0x1b65e3: ; 0x1b65e3
text "Yup, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Is that <PLAY_G>?"
@@ -1181,21 +1181,21 @@ UnknownText_0x1b65e3: ; 0x1b65e3
UnknownText_0x1b660d: ; 0x1b660d
text "Hello! It's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6624: ; 0x1b6624
text "Hello! It's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b663b: ; 0x1b663b
text "Hello! It's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1214,7 +1214,7 @@ UnknownText_0x1b6652: ; 0x1b6652
UnknownText_0x1b66c8: ; 0x1b66c8
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " on the"
line "line."
@@ -1223,7 +1223,7 @@ UnknownText_0x1b66c8: ; 0x1b66c8
UnknownText_0x1b66ec: ; 0x1b66ec
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " on the"
line "line."
@@ -1233,7 +1233,7 @@ UnknownText_0x1b66ec: ; 0x1b66ec
UnknownText_0x1b6713: ; 0x1b6713
text "Hi, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " on the"
line "line."
@@ -1246,7 +1246,7 @@ UnknownText_0x1b6738: ; 0x1b6738
para "It's me!"
line "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1255,7 +1255,7 @@ UnknownText_0x1b6757: ; 0x1b6757
para "It's me!"
line "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
@@ -1264,13 +1264,13 @@ UnknownText_0x1b6776: ; 0x1b6776
para "It's me!"
line "It's me, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b6795: ; 0x1b6795
text "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "so full of energy,"
@@ -1284,7 +1284,7 @@ UnknownText_0x1b6795: ; 0x1b6795
UnknownText_0x1b67e2: ; 0x1b67e2
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>!"
@@ -1294,7 +1294,7 @@ UnknownText_0x1b67e2: ; 0x1b67e2
UnknownText_0x1b680e: ; 0x1b680e
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>, good"
@@ -1304,7 +1304,7 @@ UnknownText_0x1b680e: ; 0x1b680e
UnknownText_0x1b6836: ; 0x1b6836
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Hi, <PLAY_G>, good"
@@ -1316,7 +1316,7 @@ UnknownText_0x1b6862: ; 0x1b6862
line "morning!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1326,7 +1326,7 @@ UnknownText_0x1b6890: ; 0x1b6890
line "day!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1336,7 +1336,7 @@ UnknownText_0x1b68ba: ; 0x1b68ba
line "evening!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
line "How are you?"
done
@@ -1386,7 +1386,7 @@ UnknownText_0x1b6a22: ; 0x1b6a22
line "morning!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ", how"
line "pika are you?"
done
@@ -1396,7 +1396,7 @@ UnknownText_0x1b6a56: ; 0x1b6a56
line "pika day!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ", how"
line "pika are you?"
done
@@ -1406,7 +1406,7 @@ UnknownText_0x1b6a8b: ; 0x1b6a8b
line "evening!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text ". Were"
line "you pika awake?"
done
@@ -1416,7 +1416,7 @@ UnknownText_0x1b6ac2: ; 0x1b6ac2
line "this! My lovable"
para "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " looked"
line "at me and grinned!"
@@ -1428,7 +1428,7 @@ UnknownText_0x1b6ac2: ; 0x1b6ac2
UnknownText_0x1b6b39: ; 0x1b6b39
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, Good morning,"
@@ -1438,7 +1438,7 @@ UnknownText_0x1b6b39: ; 0x1b6b39
UnknownText_0x1b6b65: ; 0x1b6b65
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "That voice…"
@@ -1448,7 +1448,7 @@ UnknownText_0x1b6b65: ; 0x1b6b65
UnknownText_0x1b6b92: ; 0x1b6b92
text "Hello, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "This must be"
@@ -1458,7 +1458,7 @@ UnknownText_0x1b6b92: ; 0x1b6b92
UnknownText_0x1b6bb9: ; 0x1b6bb9
text "Hello!"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "Good morning! The"
@@ -1468,7 +1468,7 @@ UnknownText_0x1b6bb9: ; 0x1b6bb9
UnknownText_0x1b6bef: ; 0x1b6bef
text "Hello!"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "What a perfect day"
@@ -1478,7 +1478,7 @@ UnknownText_0x1b6bef: ; 0x1b6bef
UnknownText_0x1b6c23: ; 0x1b6c23
text "Hello!"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "It's a great night"
@@ -1495,7 +1495,7 @@ UnknownText_0x1b6c56: ; 0x1b6c56
UnknownText_0x1b6c96: ; 0x1b6c96
text "Yes? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1504,7 +1504,7 @@ UnknownText_0x1b6c96: ; 0x1b6c96
UnknownText_0x1b6cc6: ; 0x1b6cc6
text "Yes? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1513,7 +1513,7 @@ UnknownText_0x1b6cc6: ; 0x1b6cc6
UnknownText_0x1b6cf6: ; 0x1b6cf6
text "Yes? @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "Ah, <PLAYER>. What"
@@ -1526,7 +1526,7 @@ UnknownText_0x1b6d26: ; 0x1b6d26
para "Hey! It's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1536,7 +1536,7 @@ UnknownText_0x1b6d57: ; 0x1b6d57
para "Hey, it's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1546,7 +1546,7 @@ UnknownText_0x1b6d88: ; 0x1b6d88
para "Hey, it's me,"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1564,7 +1564,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9
line "I'm impressed."
para "Heh, my @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "is so tough, it"
@@ -1576,7 +1576,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9
UnknownText_0x1b6e7c: ; 0x1b6e7c
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -1586,7 +1586,7 @@ UnknownText_0x1b6e7c: ; 0x1b6e7c
UnknownText_0x1b6ea6: ; 0x1b6ea6
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>."
@@ -1596,7 +1596,7 @@ UnknownText_0x1b6ea6: ; 0x1b6ea6
UnknownText_0x1b6ec9: ; 0x1b6ec9
text "Yes? This is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
para "Oh, <PLAY_G>, good"
@@ -1608,7 +1608,7 @@ UnknownText_0x1b6ef3: ; 0x1b6ef3
para "Good morning. This"
line "is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1616,7 +1616,7 @@ UnknownText_0x1b6f1c: ; 0x1b6f1c
text "Is this <PLAY_G>?"
para "Hi, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1625,7 +1625,7 @@ UnknownText_0x1b6f37: ; 0x1b6f37
para "Good evening. This"
line "is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "."
done
@@ -1641,7 +1641,7 @@ UnknownText_0x1b6f60: ; 0x1b6f60
line "too hard."
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
line "cute and lively"
@@ -1655,7 +1655,7 @@ UnknownText_0x1b6f60: ; 0x1b6f60
UnknownText_0x1b7019: ; 0x1b7019
text "Yes, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Morning, <PLAY_G>!"
@@ -1667,7 +1667,7 @@ UnknownText_0x1b7019: ; 0x1b7019
UnknownText_0x1b7057: ; 0x1b7057
text "Yes, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Hi, <PLAY_G>!"
@@ -1679,7 +1679,7 @@ UnknownText_0x1b7057: ; 0x1b7057
UnknownText_0x1b7092: ; 0x1b7092
text "Yes, hello?"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here!"
para "Evening, <PLAY_G>!"
@@ -1694,7 +1694,7 @@ UnknownText_0x1b70e7: ; 0x1b70e7
line "<PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Good morning!"
done
@@ -1703,7 +1703,7 @@ UnknownText_0x1b7112: ; 0x1b7112
text "Hi, <PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Remember me?"
done
@@ -1713,7 +1713,7 @@ UnknownText_0x1b7132: ; 0x1b7132
line "<PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Are you free now?"
done
@@ -1723,7 +1723,7 @@ UnknownText_0x1b7161: ; 0x1b7161
line "#MON fine?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
line "looks like it will"
@@ -1737,7 +1737,7 @@ UnknownText_0x1b7161: ; 0x1b7161
UnknownText_0x1b71d5: ; 0x1b71d5
text "Hello, you have"
line "reached @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Ah, <PLAY_G>."
@@ -1746,7 +1746,7 @@ UnknownText_0x1b71d5: ; 0x1b71d5
UnknownText_0x1b71fc: ; 0x1b71fc
text "Hello, you have"
line "reached @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Ah, <PLAY_G>, is"
@@ -1756,7 +1756,7 @@ UnknownText_0x1b71fc: ; 0x1b71fc
UnknownText_0x1b722a: ; 0x1b722a
text "Hello, you have"
line "reached @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Ah, if it isn't"
@@ -1765,7 +1765,7 @@ UnknownText_0x1b722a: ; 0x1b722a
UnknownText_0x1b725c: ; 0x1b725c
text "Ah, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Have you got a"
@@ -1774,7 +1774,7 @@ UnknownText_0x1b725c: ; 0x1b725c
UnknownText_0x1b7283: ; 0x1b7283
text "Ah, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Can you talk now?"
@@ -1782,7 +1782,7 @@ UnknownText_0x1b7283: ; 0x1b7283
UnknownText_0x1b72a5: ; 0x1b72a5
text "Ah, it's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Sorry for calling"
@@ -1794,13 +1794,13 @@ UnknownText_0x1b72d0: ; 0x1b72d0
line "grown any?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " has"
line "grown quite a bit."
done
UnknownText_0x1b730b: ; 0x1b730b
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1808,7 +1808,7 @@ UnknownText_0x1b730b: ; 0x1b730b
done
UnknownText_0x1b7331: ; 0x1b7331
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1816,7 +1816,7 @@ UnknownText_0x1b7331: ; 0x1b7331
done
UnknownText_0x1b7357: ; 0x1b7357
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text " here…"
para "<PLAYER>! Beautiful"
@@ -1826,28 +1826,28 @@ UnknownText_0x1b7357: ; 0x1b7357
UnknownText_0x1b737f: ; 0x1b737f
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b7397: ; 0x1b7397
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b73af: ; 0x1b73af
text "Hey, <PLAYER>!"
line "This is @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
done
UnknownText_0x1b73c7: ; 0x1b73c7
text "Yup, yup!"
line "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1857,7 +1857,7 @@ UnknownText_0x1b73c7: ; 0x1b73c7
UnknownText_0x1b73ef: ; 0x1b73ef
text "Yup, yup!"
line "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1867,7 +1867,7 @@ UnknownText_0x1b73ef: ; 0x1b73ef
UnknownText_0x1b7417: ; 0x1b7417
text "Yup, yup!"
line "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Hah, and here's"
@@ -1877,7 +1877,7 @@ UnknownText_0x1b7417: ; 0x1b7417
UnknownText_0x1b743f: ; 0x1b743f
text "<PLAY_G>, it's"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1887,7 +1887,7 @@ UnknownText_0x1b743f: ; 0x1b743f
UnknownText_0x1b746f: ; 0x1b746f
text "<PLAY_G>, it's"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1897,7 +1897,7 @@ UnknownText_0x1b746f: ; 0x1b746f
UnknownText_0x1b749b: ; 0x1b749b
text "<PLAY_G>, it's"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
para "Have you had a"
@@ -1909,7 +1909,7 @@ UnknownText_0x1b74c8: ; 0x1b74c8
line "looking good?"
para "My @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " and"
line "me--we're looking"
@@ -1920,7 +1920,7 @@ UnknownText_0x1b74c8: ; 0x1b74c8
UnknownText_0x1b751a: ; 0x1b751a
text "Yes, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh. Hi, <PLAY_G>!"
@@ -1930,7 +1930,7 @@ UnknownText_0x1b751a: ; 0x1b751a
UnknownText_0x1b7548: ; 0x1b7548
text "Yes, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAY_G>!"
@@ -1940,7 +1940,7 @@ UnknownText_0x1b7548: ; 0x1b7548
UnknownText_0x1b756f: ; 0x1b756f
text "Yes, this is"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "…"
para "Oh, hi, <PLAY_G>!"
@@ -1950,7 +1950,7 @@ UnknownText_0x1b758f: ; 0x1b758f
text "<PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Good morning!"
done
@@ -1959,7 +1959,7 @@ UnknownText_0x1b75ac: ; 0x1b75ac
text "<PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Working hard?"
done
@@ -1968,7 +1968,7 @@ UnknownText_0x1b75c9: ; 0x1b75c9
text "<PLAY_G>!"
para "It's @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "!"
line "Were you up?"
done
@@ -1978,10 +1978,10 @@ UnknownText_0x1b75e5: ; 0x1b75e5
line "your #MON?"
para "Hey, @"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "'s"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text " is"
cont "looking good!"
done
diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 6320838fc..f788583a2 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -1,5 +1,5 @@
; Special routines can be used with the "special" map script command.
-; They often use ScriptVar for arguments and return values.
+; They often use wScriptVar for arguments and return values.
add_special: MACRO
\1Special::
diff --git a/data/std_text.asm b/data/std_text.asm
index 4b027abac..238f0ac5d 100644
--- a/data/std_text.asm
+++ b/data/std_text.asm
@@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
ContestResults_PlayerWonAPrizeText:
text "<PLAYER>, the No.@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "finisher, wins"
cont "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "!"
done
ReceivedItemText:
text "<PLAYER> received"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "."
done
@@ -279,14 +279,14 @@ ContestResults_PartyFullText:
done
GymStatue_CityGymText:
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text_start
line "#MON GYM"
done
GymStatue_WinningTrainersText:
text "LEADER: @"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text_start
para "WINNING TRAINERS:"
line "<PLAYER>"
@@ -376,13 +376,13 @@ HappinessText1:
RegisteredNumber1Text:
text "<PLAYER> registered"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "'s number."
done
RegisteredNumber2Text:
text "<PLAYER> registered"
line "@"
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "'s number."
done
diff --git a/data/text_buffers.asm b/data/text_buffers.asm
index 5a03c8cc7..7dd7af428 100644
--- a/data/text_buffers.asm
+++ b/data/text_buffers.asm
@@ -1,9 +1,9 @@
StringBufferPointers:: ; 24000
; entries correspond to arguments for text_buffer (TX_STRINGBUFFER)
- dw StringBuffer3 ; 0
- dw StringBuffer4 ; 1
- dw StringBuffer5 ; 2
- dw StringBuffer2 ; 3
- dw StringBuffer1 ; 4
- dw EnemyMonNick ; 5
- dw BattleMonNick ; 6
+ dw wStringBuffer3 ; 0
+ dw wStringBuffer4 ; 1
+ dw wStringBuffer5 ; 2
+ dw wStringBuffer2 ; 3
+ dw wStringBuffer1 ; 4
+ dw wEnemyMonNick ; 5
+ dw wBattleMonNick ; 6
diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm
index c502846c4..ba546e417 100644
--- a/data/trainers/palettes.asm
+++ b/data/trainers/palettes.asm
@@ -1,7 +1,7 @@
TrainerPalettes: ; b0ce
; entries correspond to trainer classes
-PlayerPalette: ; Chris uses the same colors as Cal
+wPlayerPalette: ; Chris uses the same colors as Cal
INCLUDE "gfx/trainers/cal.pal"
KrisPalette: ; Kris shares Falkner's palette
INCLUDE "gfx/trainers/falkner.pal"
diff --git a/data/unused/gen_1_trainer_names.asm b/data/unused/gen_1_trainer_names.asm
index a802a5048..b3d60569d 100644
--- a/data/unused/gen_1_trainer_names.asm
+++ b/data/unused/gen_1_trainer_names.asm
@@ -3,50 +3,50 @@ Gen1TrainerClassNames: ; 50a42
dw .Youngster
dw .BugCatcher
dw .Lass
- dw OTClassName ; sailor
+ dw wOTClassName ; sailor
dw .JrTrainerM
dw .JrTrainerF
dw .Pokemaniac
dw .SuperNerd
- dw OTClassName ; hiker
- dw OTClassName ; biker
+ dw wOTClassName ; hiker
+ dw wOTClassName ; biker
dw .Burglar
dw .Engineer
dw .Jack
- dw OTClassName ; fisher
+ dw wOTClassName ; fisher
dw .Swimmer
- dw OTClassName ; cue ball
- dw OTClassName ; gambler
+ dw wOTClassName ; cue ball
+ dw wOTClassName ; gambler
dw .Beauty
- dw OTClassName ; psychic
+ dw wOTClassName ; psychic
dw .Rocker
dw .Juggler
- dw OTClassName ; tamer
- dw OTClassName ; bird keeper
+ dw wOTClassName ; tamer
+ dw wOTClassName ; bird keeper
dw .Blackbelt
- dw OTClassName ; rival1
+ dw wOTClassName ; rival1
dw .ProfOak
dw .Chief
dw .Scientist
- dw OTClassName ; giovanni
+ dw wOTClassName ; giovanni
dw .Rocket
dw .CooltrainerM
dw .CooltrainerF
- dw OTClassName ; bruno
- dw OTClassName ; brock
- dw OTClassName ; misty
- dw OTClassName ; lt.surge
- dw OTClassName ; erika
- dw OTClassName ; koga
- dw OTClassName ; blaine
- dw OTClassName ; sabrina
- dw OTClassName ; gentleman
- dw OTClassName ; rival2
- dw OTClassName ; rival3
- dw OTClassName ; lorelei
- dw OTClassName ; channeler
- dw OTClassName ; agatha
- dw OTClassName ; lance
+ dw wOTClassName ; bruno
+ dw wOTClassName ; brock
+ dw wOTClassName ; misty
+ dw wOTClassName ; lt.surge
+ dw wOTClassName ; erika
+ dw wOTClassName ; koga
+ dw wOTClassName ; blaine
+ dw wOTClassName ; sabrina
+ dw wOTClassName ; gentleman
+ dw wOTClassName ; rival2
+ dw wOTClassName ; rival3
+ dw wOTClassName ; lorelei
+ dw wOTClassName ; channeler
+ dw wOTClassName ; agatha
+ dw wOTClassName ; lance
.Youngster: db "たんパン@"
.BugCatcher: db "むしとり@"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 10:12:50 +0000