Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
--- a/data/text/battle.asm
+++ b/data/text/battle.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
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
 _HeyItsFruitText::
 	text "Hey! It's"
 	line "@"
-	text_from_ram 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."
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -27,7 +27,7 @@ UnknownText_0x1c00a0::

 UnknownText_0x1c00cd::
 	text "Hm… @"
-	text_from_ram 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 @@ _PlayersPCWithdrewItemsText::
 	deciram wItemQuantityChangeBuffer, 1, 2
 	text_start
 	line "@"
-	text_from_ram StringBuffer2
+	text_from_ram wStringBuffer2
 	text "(S)."
 	prompt

@@ -1104,7 +1104,7 @@ _PlayersPCDepositItemsText::
 	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

--- a/data/text/common_3.asm
+++ b/data/text/common_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

@@ -1288,7 +1288,7 @@ UnknownText_0x1c5c5e::
 UnknownText_0x1c5c7b::
 	text "Coins:"
 	line "@"
-	deciram Coins, 2, 4
+	deciram wCoins, 2, 4
 	db "@@"

 Text_RaiseThePPOfWhichMove::
@@ -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

--- a/data/text/std_text.asm
+++ b/data/text/std_text.asm
@@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:

 ContestResults_PlayerWonAPrizeText:
 	text "<PLAYER>, the No.@"
-	text_from_ram 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
--- a/data/text/unused_gen1_trainer_names.asm
+++ b/data/text/unused_gen1_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 "むしとり@"