Port pokecrystal's formatting of text commands and special characters

12 files changed, 676 insertions, 604 deletions

diff --git a/data/items/marts.asm b/data/items/marts.asm
index 35ae2e9d..3d7677a0 100755
--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@@ -3,62 +3,62 @@
 
 ; Viridian
 ViridianCashierText::
-	TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
+	script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
 
 ; Pewter
 PewterCashierText::
-	TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Cerulean
 CeruleanCashierText::
-	TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Bike shop
-	TX_MART BICYCLE
+	script_mart BICYCLE
 
 ; Vermilion
 VermilionCashierText::
-	TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
+	script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
 
 ; Lavender
 LavenderCashierText::
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
+	script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (1)
 CeladonMart2Clerk1Text::
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (2)
 CeladonMart2Clerk2Text::
-	TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
+	script_mart TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
 
 ; Celadon Dept. Store 4F
 CeladonMart4ClerkText::
-	TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
+	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
 
 ; Celadon Dept. Store 5F (1)
 CeladonMart5Clerk1Text::
-	TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
+	script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
 
 ; Celadon Dept. Store 5F (2)
 CeladonMart5Clerk2Text::
-	TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
+	script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
 
 ; Fuchsia
 FuchsiaCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
+	script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
 
 ; unused?
-	TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
+	script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
 
 ; Cinnabar
 CinnabarCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+	script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
 ; Saffron
 SaffronCashierText::
-	TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+	script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
 ; Indigo
 IndigoCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
+	script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
diff --git a/data/maps/names.asm b/data/maps/names.asm
index c2642942..493f3936 100755
--- a/data/maps/names.asm
+++ b/data/maps/names.asm
@@ -98,7 +98,7 @@ RocketHQName:
 SilphCoName:
 	db "SILPH CO.@"
 PokemonMansionName:
-	db "<pkmn> MANSION@"
+	db "<PKMN> MANSION@"
 SafariZoneName:
 	db "SAFARI ZONE@"
 CeruleanCaveName:
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index 495a8e33..c8dc12a7 100755
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -199,1061 +199,1061 @@ RhydonDexEntry:
 	db "DRILL@"
 	db 6,3
 	dw 2650
-	TX_FAR _RhydonDexEntry
-	db "@"
+	text_far _RhydonDexEntry
+	text_end
 
 KangaskhanDexEntry:
 	db "PARENT@"
 	db 7,3
 	dw 1760
-	TX_FAR _KangaskhanDexEntry
-	db "@"
+	text_far _KangaskhanDexEntry
+	text_end
 
 NidoranMDexEntry:
 	db "POISON PIN@"
 	db 1,8
 	dw 200
-	TX_FAR _NidoranMDexEntry
-	db "@"
+	text_far _NidoranMDexEntry
+	text_end
 
 ClefairyDexEntry:
 	db "FAIRY@"
 	db 2,0
 	dw 170
-	TX_FAR _ClefairyDexEntry
-	db "@"
+	text_far _ClefairyDexEntry
+	text_end
 
 SpearowDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
-	TX_FAR _SpearowDexEntry
-	db "@"
+	text_far _SpearowDexEntry
+	text_end
 
 VoltorbDexEntry:
 	db "BALL@"
 	db 1,8
 	dw 230
-	TX_FAR _VoltorbDexEntry
-	db "@"
+	text_far _VoltorbDexEntry
+	text_end
 
 NidokingDexEntry:
 	db "DRILL@"
 	db 4,7
 	dw 1370
-	TX_FAR _NidokingDexEntry
-	db "@"
+	text_far _NidokingDexEntry
+	text_end
 
 SlowbroDexEntry:
 	db "HERMITCRAB@"
 	db 5,3
 	dw 1730
-	TX_FAR _SlowbroDexEntry
-	db "@"
+	text_far _SlowbroDexEntry
+	text_end
 
 IvysaurDexEntry:
 	db "SEED@"
 	db 3,3
 	dw 290
-	TX_FAR _IvysaurDexEntry
-	db "@"
+	text_far _IvysaurDexEntry
+	text_end
 
 ExeggutorDexEntry:
 	db "COCONUT@"
 	db 6,7
 	dw 2650
-	TX_FAR _ExeggutorDexEntry
-	db "@"
+	text_far _ExeggutorDexEntry
+	text_end
 
 LickitungDexEntry:
 	db "LICKING@"
 	db 3,11
 	dw 1440
-	TX_FAR _LickitungDexEntry
-	db "@"
+	text_far _LickitungDexEntry
+	text_end
 
 ExeggcuteDexEntry:
 	db "EGG@"
 	db 1,4
 	dw 60
-	TX_FAR _ExeggcuteDexEntry
-	db "@"
+	text_far _ExeggcuteDexEntry
+	text_end
 
 GrimerDexEntry:
 	db "SLUDGE@"
 	db 2,11
 	dw 660
-	TX_FAR _GrimerDexEntry
-	db "@"
+	text_far _GrimerDexEntry
+	text_end
 
 GengarDexEntry:
 	db "SHADOW@"
 	db 4,11
 	dw 890
-	TX_FAR _GengarDexEntry
-	db "@"
+	text_far _GengarDexEntry
+	text_end
 
 NidoranFDexEntry:
 	db "POISON PIN@"
 	db 1,4
 	dw 150
-	TX_FAR _NidoranFDexEntry
-	db "@"
+	text_far _NidoranFDexEntry
+	text_end
 
 NidoqueenDexEntry:
 	db "DRILL@"
 	db 4,3
 	dw 1320
-	TX_FAR _NidoqueenDexEntry
-	db "@"
+	text_far _NidoqueenDexEntry
+	text_end
 
 CuboneDexEntry:
 	db "LONELY@"
 	db 1,4
 	dw 140
-	TX_FAR _CuboneDexEntry
-	db "@"
+	text_far _CuboneDexEntry
+	text_end
 
 RhyhornDexEntry:
 	db "SPIKES@"
 	db 3,3
 	dw 2540
-	TX_FAR _RhyhornDexEntry
-	db "@"
+	text_far _RhyhornDexEntry
+	text_end
 
 LaprasDexEntry:
 	db "TRANSPORT@"
 	db 8,2
 	dw 4850
-	TX_FAR _LaprasDexEntry
-	db "@"
+	text_far _LaprasDexEntry
+	text_end
 
 ArcanineDexEntry:
 	db "LEGENDARY@"
 	db 6,3
 	dw 3420
-	TX_FAR _ArcanineDexEntry
-	db "@"
+	text_far _ArcanineDexEntry
+	text_end
 
 MewDexEntry:
 	db "NEW SPECIE@"
 	db 1,4
 	dw 90
-	TX_FAR _MewDexEntry
-	db "@"
+	text_far _MewDexEntry
+	text_end
 
 GyaradosDexEntry:
 	db "ATROCIOUS@"
 	db 21,4
 	dw 5180
-	TX_FAR _GyaradosDexEntry
-	db "@"
+	text_far _GyaradosDexEntry
+	text_end
 
 ShellderDexEntry:
 	db "BIVALVE@"
 	db 1,0
 	dw 90
-	TX_FAR _ShellderDexEntry
-	db "@"
+	text_far _ShellderDexEntry
+	text_end
 
 TentacoolDexEntry:
 	db "JELLYFISH@"
 	db 2,11
 	dw 1000
-	TX_FAR _TentacoolDexEntry
-	db "@"
+	text_far _TentacoolDexEntry
+	text_end
 
 GastlyDexEntry:
 	db "GAS@"
 	db 4,3
 	dw 2
-	TX_FAR _GastlyDexEntry
-	db "@"
+	text_far _GastlyDexEntry
+	text_end
 
 ScytherDexEntry:
 	db "MANTIS@"
 	db 4,11
 	dw 1230
-	TX_FAR _ScytherDexEntry
-	db "@"
+	text_far _ScytherDexEntry
+	text_end
 
 StaryuDexEntry:
 	db "STARSHAPE@"
 	db 2,7
 	dw 760
-	TX_FAR _StaryuDexEntry
-	db "@"
+	text_far _StaryuDexEntry
+	text_end
 
 BlastoiseDexEntry:
 	db "SHELLFISH@"
 	db 5,3
 	dw 1890
-	TX_FAR _BlastoiseDexEntry
-	db "@"
+	text_far _BlastoiseDexEntry
+	text_end
 
 PinsirDexEntry:
 	db "STAGBEETLE@"
 	db 4,11
 	dw 1210
-	TX_FAR _PinsirDexEntry
-	db "@"
+	text_far _PinsirDexEntry
+	text_end
 
 TangelaDexEntry:
 	db "VINE@"
 	db 3,3
 	dw 770
-	TX_FAR _TangelaDexEntry
-	db "@"
+	text_far _TangelaDexEntry
+	text_end
 
 GrowlitheDexEntry:
 	db "PUPPY@"
 	db 2,4
 	dw 420
-	TX_FAR _GrowlitheDexEntry
-	db "@"
+	text_far _GrowlitheDexEntry
+	text_end
 
 OnixDexEntry:
 	db "ROCK SNAKE@"
 	db 28,10
 	dw 4630
-	TX_FAR _OnixDexEntry
-	db "@"
+	text_far _OnixDexEntry
+	text_end
 
 FearowDexEntry:
 	db "BEAK@"
 	db 3,11
 	dw 840
-	TX_FAR _FearowDexEntry
-	db "@"
+	text_far _FearowDexEntry
+	text_end
 
 PidgeyDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
-	TX_FAR _PidgeyDexEntry
-	db "@"
+	text_far _PidgeyDexEntry
+	text_end
 
 SlowpokeDexEntry:
 	db "DOPEY@"
 	db 3,11
 	dw 790
-	TX_FAR _SlowpokeDexEntry
-	db "@"
+	text_far _SlowpokeDexEntry
+	text_end
 
 KadabraDexEntry:
 	db "PSI@"
 	db 4,3
 	dw 1250
-	TX_FAR _KadabraDexEntry
-	db "@"
+	text_far _KadabraDexEntry
+	text_end
 
 GravelerDexEntry:
 	db "ROCK@"
 	db 3,3
 	dw 2320
-	TX_FAR _GravelerDexEntry
-	db "@"
+	text_far _GravelerDexEntry
+	text_end
 
 ChanseyDexEntry:
 	db "EGG@"
 	db 3,7
 	dw 760
-	TX_FAR _ChanseyDexEntry
-	db "@"
+	text_far _ChanseyDexEntry
+	text_end
 
 MachokeDexEntry:
 	db "SUPERPOWER@"
 	db 4,11
 	dw 1550
-	TX_FAR _MachokeDexEntry
-	db "@"
+	text_far _MachokeDexEntry
+	text_end
 
 MrMimeDexEntry:
 	db "BARRIER@"
 	db 4,3
 	dw 1200
-	TX_FAR _MrMimeDexEntry
-	db "@"
+	text_far _MrMimeDexEntry
+	text_end
 
 HitmonleeDexEntry:
 	db "KICKING@"
 	db 4,11
 	dw 1100
-	TX_FAR _HitmonleeDexEntry
-	db "@"
+	text_far _HitmonleeDexEntry
+	text_end
 
 HitmonchanDexEntry:
 	db "PUNCHING@"
 	db 4,7
 	dw 1110
-	TX_FAR _HitmonchanDexEntry
-	db "@"
+	text_far _HitmonchanDexEntry
+	text_end
 
 ArbokDexEntry:
 	db "COBRA@"
 	db 11,6
 	dw 1430
-	TX_FAR _ArbokDexEntry
-	db "@"
+	text_far _ArbokDexEntry
+	text_end
 
 ParasectDexEntry:
 	db "MUSHROOM@"
 	db 3,3
 	dw 650
-	TX_FAR _ParasectDexEntry
-	db "@"
+	text_far _ParasectDexEntry
+	text_end
 
 PsyduckDexEntry:
 	db "DUCK@"
 	db 2,7
 	dw 430
-	TX_FAR _PsyduckDexEntry
-	db "@"
+	text_far _PsyduckDexEntry
+	text_end
 
 DrowzeeDexEntry:
 	db "HYPNOSIS@"
 	db 3,3
 	dw 710
-	TX_FAR _DrowzeeDexEntry
-	db "@"
+	text_far _DrowzeeDexEntry
+	text_end
 
 GolemDexEntry:
 	db "MEGATON@"
 	db 4,7
 	dw 6620
-	TX_FAR _GolemDexEntry
-	db "@"
+	text_far _GolemDexEntry
+	text_end
 
 MagmarDexEntry:
 	db "SPITFIRE@"
 	db 4,3
 	dw 980
-	TX_FAR _MagmarDexEntry
-	db "@"
+	text_far _MagmarDexEntry
+	text_end
 
 ElectabuzzDexEntry:
 	db "ELECTRIC@"
 	db 3,7
 	dw 660
-	TX_FAR _ElectabuzzDexEntry
-	db "@"
+	text_far _ElectabuzzDexEntry
+	text_end
 
 MagnetonDexEntry:
 	db "MAGNET@"
 	db 3,3
 	dw 1320
-	TX_FAR _MagnetonDexEntry
-	db "@"
+	text_far _MagnetonDexEntry
+	text_end
 
 KoffingDexEntry:
 	db "POISON GAS@"
 	db 2,0
 	dw 20
-	TX_FAR _KoffingDexEntry
-	db "@"
+	text_far _KoffingDexEntry
+	text_end
 
 MankeyDexEntry:
 	db "PIG MONKEY@"
 	db 1,8
 	dw 620
-	TX_FAR _MankeyDexEntry
-	db "@"
+	text_far _MankeyDexEntry
+	text_end
 
 SeelDexEntry:
 	db "SEA LION@"
 	db 3,7
 	dw 1980
-	TX_FAR _SeelDexEntry
-	db "@"
+	text_far _SeelDexEntry
+	text_end
 
 DiglettDexEntry:
 	db "MOLE@"
 	db 0,8
 	dw 20
-	TX_FAR _DiglettDexEntry
-	db "@"
+	text_far _DiglettDexEntry
+	text_end
 
 TaurosDexEntry:
 	db "WILD BULL@"
 	db 4,7
 	dw 1950
-	TX_FAR _TaurosDexEntry
-	db "@"
+	text_far _TaurosDexEntry
+	text_end
 
 FarfetchdDexEntry:
 	db "WILD DUCK@"
 	db 2,7
 	dw 330
-	TX_FAR _FarfetchdDexEntry
-	db "@"
+	text_far _FarfetchdDexEntry
+	text_end
 
 VenonatDexEntry:
 	db "INSECT@"
 	db 3,3
 	dw 660
-	TX_FAR _VenonatDexEntry
-	db "@"
+	text_far _VenonatDexEntry
+	text_end
 
 DragoniteDexEntry:
 	db "DRAGON@"
 	db 7,3
 	dw 4630
-	TX_FAR _DragoniteDexEntry
-	db "@"
+	text_far _DragoniteDexEntry
+	text_end
 
 DoduoDexEntry:
 	db "TWIN BIRD@"
 	db 4,7
 	dw 860
-	TX_FAR _DoduoDexEntry
-	db "@"
+	text_far _DoduoDexEntry
+	text_end
 
 PoliwagDexEntry:
 	db "TADPOLE@"
 	db 2,0
 	dw 270
-	TX_FAR _PoliwagDexEntry
-	db "@"
+	text_far _PoliwagDexEntry
+	text_end
 
 JynxDexEntry:
 	db "HUMANSHAPE@"
 	db 4,7
 	dw 900
-	TX_FAR _JynxDexEntry
-	db "@"
+	text_far _JynxDexEntry
+	text_end
 
 MoltresDexEntry:
 	db "FLAME@"
 	db 6,7
 	dw 1320
-	TX_FAR _MoltresDexEntry
-	db "@"
+	text_far _MoltresDexEntry
+	text_end
 
 ArticunoDexEntry:
 	db "FREEZE@"
 	db 5,7
 	dw 1220
-	TX_FAR _ArticunoDexEntry
-	db "@"
+	text_far _ArticunoDexEntry
+	text_end
 
 ZapdosDexEntry:
 	db "ELECTRIC@"
 	db 5,3
 	dw 1160
-	TX_FAR _ZapdosDexEntry
-	db "@"
+	text_far _ZapdosDexEntry
+	text_end
 
 DittoDexEntry:
 	db "TRANSFORM@"
 	db 1,0
 	dw 90
-	TX_FAR _DittoDexEntry
-	db "@"
+	text_far _DittoDexEntry
+	text_end
 
 MeowthDexEntry:
 	db "SCRATCHCAT@"
 	db 1,4
 	dw 90
-	TX_FAR _MeowthDexEntry
-	db "@"
+	text_far _MeowthDexEntry
+	text_end
 
 KrabbyDexEntry:
 	db "RIVER CRAB@"
 	db 1,4
 	dw 140
-	TX_FAR _KrabbyDexEntry
-	db "@"
+	text_far _KrabbyDexEntry
+	text_end
 
 VulpixDexEntry:
 	db "FOX@"
 	db 2,0
 	dw 220
-	TX_FAR _VulpixDexEntry
-	db "@"
+	text_far _VulpixDexEntry
+	text_end
 
 NinetalesDexEntry:
 	db "FOX@"
 	db 3,7
 	dw 440
-	TX_FAR _NinetalesDexEntry
-	db "@"
+	text_far _NinetalesDexEntry
+	text_end
 
 PikachuDexEntry:
 	db "MOUSE@"
 	db 1,4
 	dw 130
-	TX_FAR _PikachuDexEntry
-	db "@"
+	text_far _PikachuDexEntry
+	text_end
 
 RaichuDexEntry:
 	db "MOUSE@"
 	db 2,7
 	dw 660
-	TX_FAR _RaichuDexEntry
-	db "@"
+	text_far _RaichuDexEntry
+	text_end
 
 DratiniDexEntry:
 	db "DRAGON@"
 	db 5,11
 	dw 70
-	TX_FAR _DratiniDexEntry
-	db "@"
+	text_far _DratiniDexEntry
+	text_end
 
 DragonairDexEntry:
 	db "DRAGON@"
 	db 13,1
 	dw 360
-	TX_FAR _DragonairDexEntry
-	db "@"
+	text_far _DragonairDexEntry
+	text_end
 
 KabutoDexEntry:
 	db "SHELLFISH@"
 	db 1,8
 	dw 250
-	TX_FAR _KabutoDexEntry
-	db "@"
+	text_far _KabutoDexEntry
+	text_end
 
 KabutopsDexEntry:
 	db "SHELLFISH@"
 	db 4,3
 	dw 890
-	TX_FAR _KabutopsDexEntry
-	db "@"
+	text_far _KabutopsDexEntry
+	text_end
 
 HorseaDexEntry:
 	db "DRAGON@"
 	db 1,4
 	dw 180
-	TX_FAR _HorseaDexEntry
-	db "@"
+	text_far _HorseaDexEntry
+	text_end
 
 SeadraDexEntry:
 	db "DRAGON@"
 	db 3,11
 	dw 550
-	TX_FAR _SeadraDexEntry
-	db "@"
+	text_far _SeadraDexEntry
+	text_end
 
 SandshrewDexEntry:
 	db "MOUSE@"
 	db 2,0
 	dw 260
-	TX_FAR _SandshrewDexEntry
-	db "@"
+	text_far _SandshrewDexEntry
+	text_end
 
 SandslashDexEntry:
 	db "MOUSE@"
 	db 3,3
 	dw 650
-	TX_FAR _SandslashDexEntry
-	db "@"
+	text_far _SandslashDexEntry
+	text_end
 
 OmanyteDexEntry:
 	db "SPIRAL@"
 	db 1,4
 	dw 170
-	TX_FAR _OmanyteDexEntry
-	db "@"
+	text_far _OmanyteDexEntry
+	text_end
 
 OmastarDexEntry:
 	db "SPIRAL@"
 	db 3,3
 	dw 770
-	TX_FAR _OmastarDexEntry
-	db "@"
+	text_far _OmastarDexEntry
+	text_end
 
 JigglypuffDexEntry:
 	db "BALLOON@"
 	db 1,8
 	dw 120
-	TX_FAR _JigglypuffDexEntry
-	db "@"
+	text_far _JigglypuffDexEntry
+	text_end
 
 WigglytuffDexEntry:
 	db "BALLOON@"
 	db 3,3
 	dw 260
-	TX_FAR _WigglytuffDexEntry
-	db "@"
+	text_far _WigglytuffDexEntry
+	text_end
 
 EeveeDexEntry:
 	db "EVOLUTION@"
 	db 1,0
 	dw 140
-	TX_FAR _EeveeDexEntry
-	db "@"
+	text_far _EeveeDexEntry
+	text_end
 
 FlareonDexEntry:
 	db "FLAME@"
 	db 2,11
 	dw 550
-	TX_FAR _FlareonDexEntry
-	db "@"
+	text_far _FlareonDexEntry
+	text_end
 
 JolteonDexEntry:
 	db "LIGHTNING@"
 	db 2,7
 	dw 540
-	TX_FAR _JolteonDexEntry
-	db "@"
+	text_far _JolteonDexEntry
+	text_end
 
 VaporeonDexEntry:
 	db "BUBBLE JET@"
 	db 3,3
 	dw 640
-	TX_FAR _VaporeonDexEntry
-	db "@"
+	text_far _VaporeonDexEntry
+	text_end
 
 MachopDexEntry:
 	db "SUPERPOWER@"
 	db 2,7
 	dw 430
-	TX_FAR _MachopDexEntry
-	db "@"
+	text_far _MachopDexEntry
+	text_end
 
 ZubatDexEntry:
 	db "BAT@"
 	db 2,7
 	dw 170
-	TX_FAR _ZubatDexEntry
-	db "@"
+	text_far _ZubatDexEntry
+	text_end
 
 EkansDexEntry:
 	db "SNAKE@"
 	db 6,7
 	dw 150
-	TX_FAR _EkansDexEntry
-	db "@"
+	text_far _EkansDexEntry
+	text_end
 
 ParasDexEntry:
 	db "MUSHROOM@"
 	db 1,0
 	dw 120
-	TX_FAR _ParasDexEntry
-	db "@"
+	text_far _ParasDexEntry
+	text_end
 
 PoliwhirlDexEntry:
 	db "TADPOLE@"
 	db 3,3
 	dw 440
-	TX_FAR _PoliwhirlDexEntry
-	db "@"
+	text_far _PoliwhirlDexEntry
+	text_end
 
 PoliwrathDexEntry:
 	db "TADPOLE@"
 	db 4,3
 	dw 1190
-	TX_FAR _PoliwrathDexEntry
-	db "@"
+	text_far _PoliwrathDexEntry
+	text_end
 
 WeedleDexEntry:
 	db "HAIRY BUG@"
 	db 1,0
 	dw 70
-	TX_FAR _WeedleDexEntry
-	db "@"
+	text_far _WeedleDexEntry
+	text_end
 
 KakunaDexEntry:
 	db "COCOON@"
 	db 2,0
 	dw 220
-	TX_FAR _KakunaDexEntry
-	db "@"
+	text_far _KakunaDexEntry
+	text_end
 
 BeedrillDexEntry:
 	db "POISON BEE@"
 	db 3,3
 	dw 650
-	TX_FAR _BeedrillDexEntry
-	db "@"
+	text_far _BeedrillDexEntry
+	text_end
 
 DodrioDexEntry:
 	db "TRIPLEBIRD@"
 	db 5,11
 	dw 1880
-	TX_FAR _DodrioDexEntry
-	db "@"
+	text_far _DodrioDexEntry
+	text_end
 
 PrimeapeDexEntry:
 	db "PIG MONKEY@"
 	db 3,3
 	dw 710
-	TX_FAR _PrimeapeDexEntry
-	db "@"
+	text_far _PrimeapeDexEntry
+	text_end
 
 DugtrioDexEntry:
 	db "MOLE@"
 	db 2,4
 	dw 730
-	TX_FAR _DugtrioDexEntry
-	db "@"
+	text_far _DugtrioDexEntry
+	text_end
 
 VenomothDexEntry:
 	db "POISONMOTH@"
 	db 4,11
 	dw 280
-	TX_FAR _VenomothDexEntry
-	db "@"
+	text_far _VenomothDexEntry
+	text_end
 
 DewgongDexEntry:
 	db "SEA LION@"
 	db 5,7
 	dw 2650
-	TX_FAR _DewgongDexEntry
-	db "@"
+	text_far _DewgongDexEntry
+	text_end
 
 CaterpieDexEntry:
 	db "WORM@"
 	db 1,0
 	dw 60
-	TX_FAR _CaterpieDexEntry
-	db "@"
+	text_far _CaterpieDexEntry
+	text_end
 
 MetapodDexEntry:
 	db "COCOON@"
 	db 2,4
 	dw 220
-	TX_FAR _MetapodDexEntry
-	db "@"
+	text_far _MetapodDexEntry
+	text_end
 
 ButterfreeDexEntry:
 	db "BUTTERFLY@"
 	db 3,7
 	dw 710
-	TX_FAR _ButterfreeDexEntry
-	db "@"
+	text_far _ButterfreeDexEntry
+	text_end
 
 MachampDexEntry:
 	db "SUPERPOWER@"
 	db 5,3
 	dw 2870
-	TX_FAR _MachampDexEntry
-	db "@"
+	text_far _MachampDexEntry
+	text_end
 
 GolduckDexEntry:
 	db "DUCK@"
 	db 5,7
 	dw 1690
-	TX_FAR _GolduckDexEntry
-	db "@"
+	text_far _GolduckDexEntry
+	text_end
 
 HypnoDexEntry:
 	db "HYPNOSIS@"
 	db 5,3
 	dw 1670
-	TX_FAR _HypnoDexEntry
-	db "@"
+	text_far _HypnoDexEntry
+	text_end
 
 GolbatDexEntry:
 	db "BAT@"
 	db 5,3
 	dw 1210
-	TX_FAR _GolbatDexEntry
-	db "@"
+	text_far _GolbatDexEntry
+	text_end
 
 MewtwoDexEntry:
 	db "GENETIC@"
 	db 6,7
 	dw 2690
-	TX_FAR _MewtwoDexEntry
-	db "@"
+	text_far _MewtwoDexEntry
+	text_end
 
 SnorlaxDexEntry:
 	db "SLEEPING@"
 	db 6,11
 	dw 10140
-	TX_FAR _SnorlaxDexEntry
-	db "@"
+	text_far _SnorlaxDexEntry
+	text_end
 
 MagikarpDexEntry:
 	db "FISH@"
 	db 2,11
 	dw 220
-	TX_FAR _MagikarpDexEntry
-	db "@"
+	text_far _MagikarpDexEntry
+	text_end
 
 MukDexEntry:
 	db "SLUDGE@"
 	db 3,11
 	dw 660
-	TX_FAR _MukDexEntry
-	db "@"
+	text_far _MukDexEntry
+	text_end
 
 KinglerDexEntry:
 	db "PINCER@"
 	db 4,3
 	dw 1320
-	TX_FAR _KinglerDexEntry
-	db "@"
+	text_far _KinglerDexEntry
+	text_end
 
 CloysterDexEntry:
 	db "BIVALVE@"
 	db 4,11
 	dw 2920
-	TX_FAR _CloysterDexEntry
-	db "@"
+	text_far _CloysterDexEntry
+	text_end
 
 ElectrodeDexEntry:
 	db "BALL@"
 	db 3,11
 	dw 1470
-	TX_FAR _ElectrodeDexEntry
-	db "@"
+	text_far _ElectrodeDexEntry
+	text_end
 
 ClefableDexEntry:
 	db "FAIRY@"
 	db 4,3
 	dw 880
-	TX_FAR _ClefableDexEntry
-	db "@"
+	text_far _ClefableDexEntry
+	text_end
 
 WeezingDexEntry:
 	db "POISON GAS@"
 	db 3,11
 	dw 210
-	TX_FAR _WeezingDexEntry
-	db "@"
+	text_far _WeezingDexEntry
+	text_end
 
 PersianDexEntry:
 	db "CLASSY CAT@"
 	db 3,3
 	dw 710
-	TX_FAR _PersianDexEntry
-	db "@"
+	text_far _PersianDexEntry
+	text_end
 
 MarowakDexEntry:
 	db "BONEKEEPER@"
 	db 3,3
 	dw 990
-	TX_FAR _MarowakDexEntry
-	db "@"
+	text_far _MarowakDexEntry
+	text_end
 
 HaunterDexEntry:
 	db "GAS@"
 	db 5,3
 	dw 2
-	TX_FAR _HaunterDexEntry
-	db "@"
+	text_far _HaunterDexEntry
+	text_end
 
 AbraDexEntry:
 	db "PSI@"
 	db 2,11
 	dw 430
-	TX_FAR _AbraDexEntry
-	db "@"
+	text_far _AbraDexEntry
+	text_end
 
 AlakazamDexEntry:
 	db "PSI@"
 	db 4,11
 	dw 1060
-	TX_FAR _AlakazamDexEntry
-	db "@"
+	text_far _AlakazamDexEntry
+	text_end
 
 PidgeottoDexEntry:
 	db "BIRD@"
 	db 3,7
 	dw 660
-	TX_FAR _PidgeottoDexEntry
-	db "@"
+	text_far _PidgeottoDexEntry
+	text_end
 
 PidgeotDexEntry:
 	db "BIRD@"
 	db 4,11
 	dw 870
-	TX_FAR _PidgeotDexEntry
-	db "@"
+	text_far _PidgeotDexEntry
+	text_end
 
 StarmieDexEntry:
 	db "MYSTERIOUS@"
 	db 3,7
 	dw 1760
-	TX_FAR _StarmieDexEntry
-	db "@"
+	text_far _StarmieDexEntry
+	text_end
 
 BulbasaurDexEntry:
 	db "SEED@"
 	db 2,4
 	dw 150
-	TX_FAR _BulbasaurDexEntry
-	db "@"
+	text_far _BulbasaurDexEntry
+	text_end
 
 VenusaurDexEntry:
 	db "SEED@"
 	db 6,7
 	dw 2210
-	TX_FAR _VenusaurDexEntry
-	db "@"
+	text_far _VenusaurDexEntry
+	text_end
 
 TentacruelDexEntry:
 	db "JELLYFISH@"
 	db 5,3
 	dw 1210
-	TX_FAR _TentacruelDexEntry
-	db "@"
+	text_far _TentacruelDexEntry
+	text_end
 
 GoldeenDexEntry:
 	db "GOLDFISH@"
 	db 2,0
 	dw 330
-	TX_FAR _GoldeenDexEntry
-	db "@"
+	text_far _GoldeenDexEntry
+	text_end
 
 SeakingDexEntry:
 	db "GOLDFISH@"
 	db 4,3
 	dw 860
-	TX_FAR _SeakingDexEntry
-	db "@"
+	text_far _SeakingDexEntry
+	text_end
 
 PonytaDexEntry:
 	db "FIRE HORSE@"
 	db 3,3
 	dw 660
-	TX_FAR _PonytaDexEntry
-	db "@"
+	text_far _PonytaDexEntry
+	text_end
 
 RapidashDexEntry:
 	db "FIRE HORSE@"
 	db 5,7
 	dw 2090
-	TX_FAR _RapidashDexEntry
-	db "@"
+	text_far _RapidashDexEntry
+	text_end
 
 RattataDexEntry:
 	db "RAT@"
 	db 1,0
 	dw 80
-	TX_FAR _RattataDexEntry
-	db "@"
+	text_far _RattataDexEntry
+	text_end
 
 RaticateDexEntry:
 	db "RAT@"
 	db 2,4
 	dw 410
-	TX_FAR _RaticateDexEntry
-	db "@"
+	text_far _RaticateDexEntry
+	text_end
 
 NidorinoDexEntry:
 	db "POISON PIN@"
 	db 2,11
 	dw 430
-	TX_FAR _NidorinoDexEntry
-	db "@"
+	text_far _NidorinoDexEntry
+	text_end
 
 NidorinaDexEntry:
 	db "POISON PIN@"
 	db 2,7
 	dw 440
-	TX_FAR _NidorinaDexEntry
-	db "@"
+	text_far _NidorinaDexEntry
+	text_end
 
 GeodudeDexEntry:
 	db "ROCK@"
 	db 1,4
 	dw 440
-	TX_FAR _GeodudeDexEntry
-	db "@"
+	text_far _GeodudeDexEntry
+	text_end
 
 PorygonDexEntry:
 	db "VIRTUAL@"
 	db 2,7
 	dw 800
-	TX_FAR _PorygonDexEntry
-	db "@"
+	text_far _PorygonDexEntry
+	text_end
 
 AerodactylDexEntry:
 	db "FOSSIL@"
 	db 5,11
 	dw 1300
-	TX_FAR _AerodactylDexEntry
-	db "@"
+	text_far _AerodactylDexEntry
+	text_end
 
 MagnemiteDexEntry:
 	db "MAGNET@"
 	db 1,0
 	dw 130
-	TX_FAR _MagnemiteDexEntry
-	db "@"
+	text_far _MagnemiteDexEntry
+	text_end
 
 CharmanderDexEntry:
 	db "LIZARD@"
 	db 2,0
 	dw 190
-	TX_FAR _CharmanderDexEntry
-	db "@"
+	text_far _CharmanderDexEntry
+	text_end
 
 SquirtleDexEntry:
 	db "TINYTURTLE@"
 	db 1,8
 	dw 200
-	TX_FAR _SquirtleDexEntry
-	db "@"
+	text_far _SquirtleDexEntry
+	text_end
 
 CharmeleonDexEntry:
 	db "FLAME@"
 	db 3,7
 	dw 420
-	TX_FAR _CharmeleonDexEntry
-	db "@"
+	text_far _CharmeleonDexEntry
+	text_end
 
 WartortleDexEntry:
 	db "TURTLE@"
 	db 3,3
 	dw 500
-	TX_FAR _WartortleDexEntry
-	db "@"
+	text_far _WartortleDexEntry
+	text_end
 
 CharizardDexEntry:
 	db "FLAME@"
 	db 5,7
 	dw 2000
-	TX_FAR _CharizardDexEntry
-	db "@"
+	text_far _CharizardDexEntry
+	text_end
 
 OddishDexEntry:
 	db "WEED@"
 	db 1,8
 	dw 120
-	TX_FAR _OddishDexEntry
-	db "@"
+	text_far _OddishDexEntry
+	text_end
 
 GloomDexEntry:
 	db "WEED@"
 	db 2,7
 	dw 190
-	TX_FAR _GloomDexEntry
-	db "@"
+	text_far _GloomDexEntry
+	text_end
 
 VileplumeDexEntry:
 	db "FLOWER@"
 	db 3,11
 	dw 410
-	TX_FAR _VileplumeDexEntry
-	db "@"
+	text_far _VileplumeDexEntry
+	text_end
 
 BellsproutDexEntry:
 	db "FLOWER@"
 	db 2,4
 	dw 90
-	TX_FAR _BellsproutDexEntry
-	db "@"
+	text_far _BellsproutDexEntry
+	text_end
 
 WeepinbellDexEntry:
 	db "FLYCATCHER@"
 	db 3,3
 	dw 140
-	TX_FAR _WeepinbellDexEntry
-	db "@"
+	text_far _WeepinbellDexEntry
+	text_end
 
 VictreebelDexEntry:
 	db "FLYCATCHER@"
 	db 5,7
 	dw 340
-	TX_FAR _VictreebelDexEntry
-	db "@"
+	text_far _VictreebelDexEntry
+	text_end
 
 MissingNoDexEntry:
 	db "???@"
 	db 10 ; 1.0 m
 	db 100 ; 10.0 kg
-	text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
+	text "コメント　さくせいちゅう@" ; コメント作成中 (Comment to be written)
diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm
index 9799a7e6..07e6cf96 100644
--- a/data/text/alphabets.asm
+++ b/data/text/alphabets.asm
@@ -1,5 +1,15 @@
 LowerCaseAlphabet:
-	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
+	db "abcdefghi"
+	db "jklmnopqr"
+	db "stuvwxyz "
+	db "×():;[]<PK><MN>"
+	db "-?!♂♀/<DOT>,<ED>"
+	db "UPPER CASE@"
 
 UpperCaseAlphabet:
-	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
+	db "ABCDEFGHI"
+	db "JKLMNOPQR"
+	db "STUVWXYZ "
+	db "×():;[]<PK><MN>"
+	db "-?!♂♀/<DOT>,<ED>"
+	db "lower case@"
diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm
index f3bf4854..7a53c71f 100644
--- a/data/text/dakutens.asm
+++ b/data/text/dakutens.asm
@@ -7,9 +7,9 @@ Dakutens:
 	db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
 	db "タダ", "チヂ", "ツヅ", "テデ", "トド"
 	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
-	db $ff
+	db -1 ; end
 
 Handakutens:
 	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
 	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
-	db $ff
+	db -1 ; end
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index 1ab54da3..af1d3827 100644
--- a/data/text/text_1.asm
+++ b/data/text/text_1.asm
@@ -1,8 +1,9 @@
 _CardKeySuccessText1::
-	text "Bingo!@@"
+	text "Bingo!@"
+	text_end
 
 _CardKeySuccessText2::
-	text ""
+	text_start
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
@@ -13,8 +14,9 @@ _CardKeyFailText::
 	done
 
 _TrainerNameText::
-	TX_RAM wcd6d
-	text ": @@"
+	text_ram wcd6d
+	text ": @"
+	text_end
 
 _NoNibbleText::
 	text "Not even a nibble!"
@@ -58,8 +60,9 @@ _PokeCenterSignText::
 _FoundItemText::
 	text "<PLAYER> found"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _NoMoreRoomForItemText::
 	text "No more room for"
@@ -72,19 +75,19 @@ _OaksAideHiText::
 	cont "AIDE!"
 
 	para "If you caught @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
+	text_decimal hOaksAideRequirement, 1, 3
+	text_start
 	line "kinds of #MON,"
 	cont "I'm supposed to"
 	cont "give you an"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "!"
 
 	para "So, <PLAYER>! Have"
 	line "you caught at"
 	cont "least @"
-	TX_NUM hOaksAideRequirement, 1, 3
+	text_decimal hOaksAideRequirement, 1, 3
 	text " kinds of"
 	cont "#MON?"
 	done
@@ -93,16 +96,16 @@ _OaksAideUhOhText::
 	text "Let's see..."
 	line "Uh-oh! You have"
 	cont "caught only @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
-	text ""
+	text_decimal hOaksAideNumMonsOwned, 1, 3
+	text_start
 	cont "kinds of #MON!"
 
 	para "You need @"
-	TX_NUM hOaksAideRequirement, 1, 3
+	text_decimal hOaksAideRequirement, 1, 3
 	text " kinds"
 	line "if you want the"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
 
@@ -110,18 +113,18 @@ _OaksAideComeBackText::
 	text "Oh. I see."
 
 	para "When you get @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
+	text_decimal hOaksAideRequirement, 1, 3
+	text_start
 	line "kinds, come back"
 	cont "for @"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
 
 _OaksAideHereYouGoText::
 	text "Great! You have"
 	line "caught @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text_decimal hOaksAideNumMonsOwned, 1, 3
 	text " kinds "
 	cont "of #MON!"
 	cont "Congratulations!"
@@ -132,14 +135,15 @@ _OaksAideHereYouGoText::
 _OaksAideGotItemText::
 	text "<PLAYER> got the"
 	line "@"
-	TX_RAM wOaksAideRewardItemName
-	text "!@@"
+	text_ram wOaksAideRewardItemName
+	text "!@"
+	text_end
 
 _OaksAideNoRoomText::
 	text "Oh! I see you"
 	line "don't have any"
 	cont "room for the"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 01e8641b..5e620fbb 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -1,53 +1,53 @@
 _AIBattleWithdrawText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " with-"
 	line "drew @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	prompt
 
 _AIBattleUseItemText::
-	TX_RAM wTrainerName
-	text ""
+	text_ram wTrainerName
+	text_start
 	line "used @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	cont "on @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	prompt
 
 _TradeWentToText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " went"
 	line "to @"
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text "."
 	done
 
 _TradeForText::
 	text "For <PLAYER>'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text ","
 	done
 
 _TradeSendsText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " sends"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	done
 
 _TradeWavesFarewellText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " waves"
 	line "farewell as"
 	done
 
 _TradeTransferredText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is"
 	line "transferred."
 	done
@@ -55,22 +55,22 @@ _TradeTransferredText::
 _TradeTakeCareText::
 	text "Take good care of"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	done
 
 _TradeWillTradeText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " will"
 	line "trade @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	done
 
 _TradeforText::
 	text "for <PLAYER>'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	done
 
@@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText::
 _LinedUpText::
 	text " lined up!"
 	line "Scored @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " coins!"
 	done
 
@@ -115,39 +115,40 @@ _NotThisTimeText::
 	prompt
 
 _YeahText::
-	text "Yeah!@@"
+	text "Yeah!@"
+	text_end
 
 _DexSeenOwnedText::
 	text "#DEX   Seen:@"
-	TX_NUM wDexRatingNumMonsSeen, 1, 3
-	text ""
+	text_decimal wDexRatingNumMonsSeen, 1, 3
+	text_start
 	line "         Owned:@"
-	TX_NUM wDexRatingNumMonsOwned, 1, 3
-	db "@"
+	text_decimal wDexRatingNumMonsOwned, 1, 3
+	text_end
 
 _DexRatingText::
-	text "#DEX Rating", $6d
+	text "#DEX Rating<COLON>"
 	done
 
 _GymStatueText1::
-	TX_RAM wGymCityName
-	text ""
+	text_ram wGymCityName
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
+	text_ram wGymLeaderName
+	text_start
 
 	para "WINNING TRAINERS:"
 	line "<RIVAL>"
 	done
 
 _GymStatueText2::
-	TX_RAM wGymCityName
-	text ""
+	text_ram wGymCityName
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
+	text_ram wGymLeaderName
+	text_start
 
 	para "WINNING TRAINERS:"
 	line "<RIVAL>"
@@ -375,7 +376,8 @@ _CinnabarGymQuizCorrectText::
 	text "You're absolutely"
 	line "correct!"
 
-	para "Go on through!@@"
+	para "Go on through!@"
+	text_end
 
 _CinnabarGymQuizIncorrectText::
 	text "Sorry! Bad call!"
@@ -398,7 +400,8 @@ _BillsHouseMonitorText::
 _BillsHouseInitiatedText::
 	text "<PLAYER> initiated"
 	line "TELEPORTER's Cell"
-	cont "Separator!@@"
+	cont "Separator!@"
+	text_end
 
 _BillsHousePokemonListText1::
 	text "BILL's favorite"
@@ -479,7 +482,8 @@ TMNotebookText::
 	line "HMs that can be"
 	cont "used repeatedly."
 
-	para "SILPH CO.@@"
+	para "SILPH CO.@"
+	text_end
 
 _TurnPageText::
 	text "Turn the page?"
@@ -487,7 +491,8 @@ _TurnPageText::
 
 _ViridianSchoolNotebookText5::
 	text "GIRL: Hey! Don't"
-	line "look at my notes!@@"
+	line "look at my notes!@"
+	text_end
 
 _ViridianSchoolNotebookText1::
 	text "Looked at the"
@@ -718,7 +723,8 @@ _VermilionGymTrashSuccessText1::
 	cont "Turn it on!"
 
 	para "The 1st electric"
-	line "lock opened!@@"
+	line "lock opened!@"
+	text_end
 
 _VermilionGymTrashSuccessText2::
 	text "Hey! There's"
@@ -732,19 +738,22 @@ _VermilionGymTrashSuccessText3::
 	line "lock opened!"
 
 	para "The motorized door"
-	line "opened!@@"
+	line "opened!@"
+	text_end
 
 _VermilionGymTrashFailText::
 	text "Nope! There's"
 	line "only trash here."
 	cont "Hey! The electric"
-	cont "locks were reset!@@"
+	cont "locks were reset!@"
+	text_end
 
 _FoundHiddenItemText::
 	text "<PLAYER> found"
 	line "@"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _HiddenItemBagFullText::
 	text "But, <PLAYER> has"
@@ -755,17 +764,19 @@ _HiddenItemBagFullText::
 _FoundHiddenCoinsText::
 	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@"
+	text_end
 
 _FoundHiddenCoins2Text::
 	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@"
+	text_end
 
 _DroppedHiddenCoinsText::
-	text ""
+	text_start
 	para "Oops! Dropped"
 	line "some coins!"
 	done
@@ -802,7 +813,8 @@ _ElevatorText::
 	done
 
 _TownMapText::
-	text "A TOWN MAP.@@"
+	text "A TOWN MAP.@"
+	text_end
 
 _PokemonStuffText::
 	text "Wow! Tons of"
@@ -818,15 +830,15 @@ _OutOfSafariBallsText::
 
 _WildRanText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "ran!"
 	prompt
 
 _EnemyRanText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "ran!"
 	prompt
 
@@ -847,28 +859,28 @@ _HurtByLeechSeedText::
 
 _EnemyMonFaintedText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "fainted!"
 	prompt
 
 _MoneyForWinningText::
 	text "<PLAYER> got ¥@"
-	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text ""
+	text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_start
 	line "for winning!"
 	prompt
 
 _TrainerDefeatedText::
 	text "<PLAYER> defeated"
 	line "@"
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text "!"
 	prompt
 
 _PlayerMonFaintedText::
-	TX_RAM wBattleMonNick
-	text ""
+	text_ram wBattleMonNick
+	text_start
 	line "fainted!"
 	prompt
 
@@ -892,16 +904,16 @@ _PlayerBlackedOutText2::
 _LinkBattleLostText::
 	text "<PLAYER> lost to"
 	line "@"
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text "!"
 	prompt
 
 _TrainerAboutToUseText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " is"
 	line "about to use"
 	cont"@"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 
 	para "Will <PLAYER>"
@@ -909,10 +921,10 @@ _TrainerAboutToUseText::
 	done
 
 _TrainerSentOutText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " sent"
 	line "out @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	done
 
@@ -941,7 +953,7 @@ _ItemsCantBeUsedHereText::
 	prompt
 
 _AlreadyOutText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is"
 	line "already out!"
 	prompt
@@ -957,7 +969,7 @@ _MoveDisabledText::
 	prompt
 
 _NoMovesLeftText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " has no"
 	line "moves left!"
 	done
@@ -965,12 +977,12 @@ _NoMovesLeftText::
 _MultiHitText::
 	text "Hit the enemy"
 	line "@"
-	TX_NUM wPlayerNumHits,1,1
+	text_decimal wPlayerNumHits, 1, 1
 	text " times!"
 	prompt
 
 _ScaredText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is too"
 	line "scared to move!"
 	prompt
@@ -1058,28 +1070,32 @@ _CantMoveText::
 _MoveIsDisabledText::
 	text "<USER>'s"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is"
 	cont "disabled!"
 	prompt
 
 _MonName1Text::
-	text "<USER>@@"
+	text "<USER>@"
+	text_end
 
 _Used1Text::
-	text ""
-	line "used @@"
+	text_start
+	line "used @"
+	text_end
 
 _Used2Text::
-	text ""
-	line "used @@"
+	text_start
+	line "used @"
+	text_end
 
 _InsteadText::
 	text "instead,"
-	cont "@@"
+	cont "@"
+	text_end
 
 _CF4BText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "@"
 
 _ExclamationPoint1Text::
@@ -1132,32 +1148,32 @@ _OHKOText::
 	prompt
 
 _LoafingAroundText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is"
 	line "loafing around."
 	prompt
 
 _BeganToNapText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " began"
 	line "to nap!"
 	prompt
 
 _WontObeyText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " won't"
 	line "obey!"
 	prompt
 
 _TurnedAwayText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " turned"
 	line "away!"
 	prompt
 
 _IgnoredOrdersText::
-	TX_RAM wBattleMonNick
-	text ""
+	text_ram wBattleMonNick
+	text_start
 	line "ignored orders!"
 	prompt
 
@@ -1184,58 +1200,62 @@ _MirrorMoveFailedText::
 
 _HitXTimesText::
 	text "Hit @"
-	TX_NUM wEnemyNumHits, 1, 1
+	text_decimal wEnemyNumHits, 1, 1
 	text " times!"
 	prompt
 
 _GainedText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " gained"
-	line "@@"
+	line "@"
+	text_end
 
 _WithExpAllText::
 	text "with EXP.ALL,"
-	cont "@@"
+	cont "@"
+	text_end
 
 _BoostedText::
 	text "a boosted"
-	cont "@@"
+	cont "@"
+	text_end
 
 _ExpPointsText::
-	TX_NUM wExpAmountGained, 2, 4
+	text_decimal wExpAmountGained, 2, 4
 	text " EXP. Points!"
 	prompt
 
 _GrewLevelText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
+	text_decimal wCurEnemyLVL, 1, 3
+	text "!@"
+	text_end
 
 _WildMonAppearedText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "appeared!"
 	prompt
 
 _HookedMonAttackedText::
 	text "The hooked"
 	line "@"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	cont "attacked!"
 	prompt
 
 _EnemyAppearedText::
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "appeared!"
 	prompt
 
 _TrainerWantsToFightText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " wants"
 	line "to fight!"
 	prompt
@@ -1252,38 +1272,46 @@ _GhostCantBeIDdText::
 	prompt
 
 _GoText::
-	text "Go! @@"
+	text "Go! @"
+	text_end
 
 _DoItText::
-	text "Do it! @@"
+	text "Do it! @"
+	text_end
 
 _GetmText::
-	text "Get'm! @@"
+	text "Get'm! @"
+	text_end
 
 _EnemysWeakText::
 	text "The enemy's weak!"
-	line "Get'm! @@"
+	line "Get'm! @"
+	text_end
 
 _PlayerMon1Text::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text "!"
 	done
 
 _PlayerMon2Text::
-	TX_RAM wBattleMonNick
-	text " @@"
+	text_ram wBattleMonNick
+	text " @"
+	text_end
 
 _EnoughText::
-	text "enough!@@"
+	text "enough!@"
+	text_end
 
 _OKExclamationText::
-	text "OK!@@"
+	text "OK!@"
+	text_end
 
 _GoodText::
-	text "good!@@"
+	text "good!@"
+	text_end
 
 _ComeBackText::
-	text ""
+	text_start
 	line "Come back!"
 	done
 
@@ -1299,15 +1327,15 @@ _NotVeryEffectiveText::
 
 _SafariZoneEatingText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "is eating!"
 	prompt
 
 _SafariZoneAngryText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "is angry!"
 	prompt
 
@@ -1315,7 +1343,7 @@ _SafariZoneAngryText::
 _PickUpPayDayMoneyText::
 	text "<PLAYER> picked up"
 	line "¥@"
-	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text "!"
 	prompt
 
@@ -1354,61 +1382,62 @@ _PartyMenuSwapMonText::
 	done
 
 _PotionText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "recovered by @"
-	TX_NUM wHPBarHPDifference, 2, 3
+	text_decimal wHPBarHPDifference, 2, 3
 	text "!"
 	done
 
 _AntidoteText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "cured of poison!"
 	done
 
 _ParlyzHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "rid of paralysis!"
 	done
 
 _BurnHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "burn was healed!"
 	done
 
 _IceHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "defrosted!"
 	done
 
 _AwakeningText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "woke up!"
 	done
 
 _FullHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "health returned!"
 	done
 
 _ReviveText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "is revitalized!"
 	done
 
 _RareCandyText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
+	text_decimal wCurEnemyLVL, 1, 3
+	text "!@"
+	text_end
 
 _TurnedOnPC1Text::
 	text "<PLAYER> turned on"
@@ -1458,7 +1487,7 @@ _DepositHowManyText::
 	done
 
 _ItemWasStoredText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "stored via PC."
 	prompt
@@ -1485,7 +1514,7 @@ _WithdrawHowManyText::
 _WithdrewItemText::
 	text "Withdrew"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	prompt
 
@@ -1530,10 +1559,10 @@ _DepositWhichMonText::
 	done
 
 _MonWasStoredText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " was"
 	line "stored in Box @"
-	TX_RAM wBoxNumString
+	text_ram wBoxNumString
 	text "."
 	prompt
 
@@ -1548,11 +1577,11 @@ _BoxFullText::
 	prompt
 
 _MonIsTakenOutText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " is"
 	line "taken out."
 	cont "Got @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
@@ -1577,25 +1606,26 @@ _ReleaseWhichMonText::
 _OnceReleasedText::
 	text "Once released,"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " is"
 	cont "gone forever. OK?"
 	done
 
 _MonWasReleasedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " was"
 	line "released outside."
 	cont "Bye @"
 
 _CF4BExclamationText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _RequireCoinCaseText::
 	text "A COIN CASE is"
-	line "required!@@"
+	line "required!@"
+	text_end
 
 _ExchangeCoinsForPrizesText::
 	text "We exchange your"
@@ -1608,25 +1638,29 @@ _WhichPrizeText::
 	done
 
 _HereYouGoText::
-	text "Here you go!@@"
+	text "Here you go!@"
+	text_end
 
 _SoYouWantPrizeText::
 	text "So, you want"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "?"
 	done
 
 _SorryNeedMoreCoinsText::
 	text "Sorry, you need"
-	line "more coins.@@"
+	line "more coins.@"
+	text_end
 
 _OopsYouDontHaveEnoughRoomText::
 	text "Oops! You don't"
-	line "have enough room.@@"
+	line "have enough room.@"
+	text_end
 
 _OhFineThenText::
-	text "Oh, fine then.@@"
+	text "Oh, fine then.@"
+	text_end
 
 _GetDexRatedText::
 	text "Want to get your"
@@ -1635,7 +1669,8 @@ _GetDexRatedText::
 
 _ClosedOaksPCText::
 	text "Closed link to"
-	line "PROF.OAK's PC.@@"
+	line "PROF.OAK's PC.@"
+	text_end
 
 _AccessedOaksPCText::
 	text "Accessed PROF."
@@ -1674,10 +1709,13 @@ _OakSpeechText2A::
 	text "This world is"
 	line "inhabited by"
 	cont "creatures called"
-	cont "#MON!@@"
+	cont "#MON!@"
+	text_end
 
 _OakSpeechText2B::
-	text $51,"For some people,"
+	text_start
+
+	para "For some people,"
 	line "#MON are"
 	cont "pets. Others use"
 	cont "them for fights."
@@ -1720,7 +1758,7 @@ _DoYouWantToNicknameText::
 	text "Do you want to"
 	line "give a nickname"
 	cont "to @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "?"
 	done
 
@@ -1736,18 +1774,19 @@ _HisNameIsText::
 	prompt
 
 _WillBeTradedText::
-	TX_RAM wNameOfPlayerMonToBeTraded
+	text_ram wNameOfPlayerMonToBeTraded
 	text " and"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " will"
 	cont "be traded."
 	done
 
-_Char00Text::
-	TX_NUM hSpriteIndexOrTextID,1,2
+_TextIDErrorText::
+	text_decimal hSpriteIndexOrTextID, 1, 2
 	text " ERROR."
 	done
 
-_Char55Text::
-	text $4B,"@@"
+_ContCharText::
+	text "<_CONT>@"
+	text_end
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index 3b2ff787..6407dce7 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -29,31 +29,32 @@ _WhenYouChangeBoxText::
 
 _ChooseABoxText::
 	text "Choose a"
-	line "<pkmn> BOX.@@"
+	line "<PKMN> BOX.@"
+	text_end
 
 _EvolvedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " evolved"
 	done
 
 _IntoText::
-	text ""
+	text_start
 	line "into @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	done
 
 _StoppedEvolvingText::
 	text "Huh? @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "stopped evolving!"
 	prompt
 
 _IsEvolvingText::
 	text "What? @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "is evolving!"
 	done
 
@@ -95,11 +96,13 @@ _FireDefrostedText::
 _MonsStatsRoseText::
 	text "<USER>'s"
 	line "@"
-	TX_RAM wcf4b
-	text "@@"
+	text_ram wcf4b
+	text "@"
+	text_end
 
 _GreatlyRoseText::
-	text $4c, "greatly@@"
+	text "<SCROLL>greatly@"
+	text_end
 
 _RoseText::
 	text " rose!"
@@ -108,11 +111,13 @@ _RoseText::
 _MonsStatsFellText::
 	text "<TARGET>'s"
 	line "@"
-	TX_RAM wcf4b
-	text "@@"
+	text_ram wcf4b
+	text "@"
+	text_end
 
 _GreatlyFellText::
-	text $4c, "greatly@@"
+	text "<SCROLL>greatly@"
+	text_end
 
 _FellText::
 	text " fell!"
@@ -134,35 +139,36 @@ _WasBlownAwayText::
 	prompt
 
 _ChargeMoveEffectText::
-	text "<USER>@@"
+	text "<USER>@"
+	text_end
 
 _MadeWhirlwindText::
-	text ""
+	text_start
 	line "made a whirlwind!"
 	prompt
 
 _TookInSunlightText::
-	text ""
+	text_start
 	line "took in sunlight!"
 	prompt
 
 _LoweredItsHeadText::
-	text ""
+	text_start
 	line "lowered its head!"
 	prompt
 
 _SkyAttackGlowingText::
-	text ""
+	text_start
 	line "is glowing!"
 	prompt
 
 _FlewUpHighText::
-	text ""
+	text_start
 	line "flew up high!"
 	prompt
 
 _DugAHoleText::
-	text ""
+	text_start
 	line "dug a hole!"
 	prompt
 
@@ -175,14 +181,14 @@ _MimicLearnedMoveText::
 	text "<USER>"
 	line "learned"
 	cont "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
 _MoveWasDisabledText::
 	text "<TARGET>'s"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	cont "disabled!"
 	prompt
@@ -285,7 +291,7 @@ _TransformedText::
 	text "<USER>"
 	line "transformed into"
 	cont "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
index 6ec22680..4c01b5f4 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -4,8 +4,8 @@ _PokemartGreetingText::
 	done
 
 _PokemonFaintedText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "fainted!"
 	done
 
@@ -27,11 +27,11 @@ _PokemartBuyingGreetingText::
 	done
 
 _PokemartTellBuyPriceText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	line "That will be"
 	cont "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text ". OK?"
 	done
 
@@ -58,7 +58,7 @@ _PokemonSellingGreetingText::
 _PokemartTellSellPriceText::
 	text "I can pay you"
 	line "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text " for that."
 	done
 
@@ -82,11 +82,12 @@ _PokemartAnythingElseText::
 	done
 
 _LearnedMove1Text::
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " learned"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _WhichMoveToForgetText::
 	text "Which move should"
@@ -96,53 +97,55 @@ _WhichMoveToForgetText::
 _AbandonLearningText::
 	text "Abandon learning"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	done
 
 _DidNotLearnText::
-	TX_RAM wLearnMoveMonName
-	text ""
+	text_ram wLearnMoveMonName
+	text_start
 	line "did not learn"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _TryingToLearnText::
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " is"
 	line "trying to learn"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 
 	para "But, @"
-	TX_RAM wLearnMoveMonName
-	text ""
+	text_ram wLearnMoveMonName
+	text_start
 	line "can't learn more"
 	cont "than 4 moves!"
 
 	para "Delete an older"
 	line "move to make room"
 	cont "for @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	done
 
 _OneTwoAndText::
-	text "1, 2 and...@@"
+	text "1, 2 and...@"
+	text_end
 
 _PoofText::
-	text " Poof!@@"
+	text " Poof!@"
+	text_end
 
 _ForgotAndText::
-	text ""
+	text_start
 	para "@"
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " forgot"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "And..."
@@ -204,7 +207,8 @@ _CableClubNPCPleaseApplyHereHaveToSaveText::
 	done
 
 _CableClubNPCPleaseWaitText::
-	text "Please wait.@@"
+	text "Please wait.@"
+	text_end
 
 _CableClubNPCLinkClosedBecauseOfInactivityText::
 	text "The link has been"
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index 26a11a40..ae7151cc 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -9,12 +9,13 @@ _CableClubNPCMakingPreparationsText::
 	done
 
 _UsedStrengthText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " used"
-	line "STRENGTH.@@"
+	line "STRENGTH.@"
+	text_end
 
 _CanMoveBouldersText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can"
 	line "move boulders."
 	prompt
@@ -40,13 +41,13 @@ _WarpToLastPokemonCenterText::
 	done
 
 _CannotUseTeleportNowText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can't"
 	line "use TELEPORT now."
 	prompt
 
 _CannotFlyHereText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can't"
 	line "FLY here."
 	prompt
@@ -74,18 +75,19 @@ _CannotGetOffHereText::
 _GotMonText::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _SentToBoxText::
 	text "There's no more"
 	line "room for #MON!"
 	cont "@"
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	cont "sent to #MON"
 	cont "BOX @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " on PC!"
 	done
 
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
index 45c553cd..39eb22ea 100644
--- a/data/text/text_6.asm
+++ b/data/text/text_6.asm
@@ -29,19 +29,20 @@ _ItemUseBallText04::
 _ItemUseBallText05::
 	text "All right!"
 	line "@"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text " was"
-	cont "caught!@@"
+	cont "caught!@"
+	text_end
 
 _ItemUseBallText07::
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	line "transferred to"
 	cont "BILL's PC!"
 	prompt
 
 _ItemUseBallText08::
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	line "transferred to"
 	cont "someone's PC!"
@@ -51,13 +52,14 @@ _ItemUseBallText06::
 	text "New #DEX data"
 	line "will be added for"
 	cont "@"
-	TX_RAM wEnemyMonNick
-	text "!@@"
+	text_ram wEnemyMonNick
+	text "!@"
+	text_end
 
 _SurfingGotOnText::
 	text "<PLAYER> got on"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
@@ -67,10 +69,10 @@ _SurfingNoPlaceToGetOffText::
 	prompt
 
 _VitaminStatRoseText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " rose."
 	prompt
 
@@ -104,12 +106,13 @@ _FluteWokeUpText::
 
 _PlayedFluteHadEffectText::
 	text "<PLAYER> played the"
-	line "# FLUTE.@@"
+	line "# FLUTE.@"
+	text_end
 
 _CoinCaseNumCoinsText::
 	text "Coins"
 	line "@"
-	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
 	text " "
 	prompt
 
@@ -135,13 +138,13 @@ _RestorePPWhichTechniqueText::
 	done
 
 _PPMaxedOutText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "'s PP"
 	line "is maxed out."
 	prompt
 
 _PPIncreasedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "'s PP"
 	line "increased."
 	prompt
@@ -161,26 +164,26 @@ _BootedUpHMText::
 _TeachMachineMoveText::
 	text "It contained"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 
 	para "Teach @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "to a #MON?"
 	done
 
 _MonCannotLearnMachineMoveText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is not"
 	line "compatible with"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 
 	para "It can't learn"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
@@ -217,7 +220,7 @@ _NoCyclingAllowedHereText::
 _NoSurfingHereText::
 	text "No SURFing on"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " here!"
 	prompt
 
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index e836fc8e..34f070bd 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -1,39 +1,42 @@
 _ItemUseText001::
-	text "<PLAYER> used@@"
+	text "<PLAYER> used@"
+	text_end
 
 _ItemUseText002::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	done
 
 _GotOnBicycleText1::
-	text "<PLAYER> got on the@@"
+	text "<PLAYER> got on the@"
+	text_end
 
 _GotOnBicycleText2::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _GotOffBicycleText1::
-	text "<PLAYER> got off@@"
+	text "<PLAYER> got off@"
+	text_end
 
 _GotOffBicycleText2::
 	text "the @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
 _ThrewAwayItemText::
 	text "Threw away"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	prompt
 
 _IsItOKToTossItemText::
 	text "Is it OK to toss"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	prompt
 
@@ -43,10 +46,10 @@ _TooImportantToTossText::
 	prompt
 
 _AlreadyKnowsText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " knows"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
@@ -58,21 +61,22 @@ _ConnectCableText::
 _TradedForText::
 	text "<PLAYER> traded"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " for"
 	cont "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text "!@@"
+	text_ram wInGameTradeReceiveMonName
+	text "!@"
+	text_end
 
 _WannaTrade1Text::
 	text "I'm looking for"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "! Wanna"
 
 	para "trade one for"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "? "
 	done
 
@@ -84,7 +88,7 @@ _NoTrade1Text::
 _WrongMon1Text::
 	text "What? That's not"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "!"
 
 	para "If you get one,"
@@ -98,7 +102,7 @@ _Thanks1Text::
 _AfterTrade1Text::
 	text "Isn't my old"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text " great?"
 	done
 
@@ -107,10 +111,10 @@ _WannaTrade2Text::
 	line "you want to trade"
 
 	para "your @"
-	TX_RAM wInGameTradeGiveMonName
-	text ""
+	text_ram wInGameTradeGiveMonName
+	text_start
 	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 	done
 
@@ -122,7 +126,7 @@ _NoTrade2Text::
 _WrongMon2Text::
 	text "Hmmm? This isn't"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "."
 
 	para "Think of me when"
@@ -135,7 +139,7 @@ _Thanks2Text::
 
 _AfterTrade2Text::
 	text "The @"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " you"
 	line "traded to me"
 
@@ -145,12 +149,12 @@ _AfterTrade2Text::
 _WannaTrade3Text::
 	text "Hi! Do you have"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "?"
 
 	para "Want to trade it"
 	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 	done
 
@@ -161,7 +165,7 @@ _NoTrade3Text::
 _WrongMon3Text::
 	text "...This is no"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "."
 
 	para "If you get one,"
@@ -175,11 +179,11 @@ _Thanks3Text::
 _AfterTrade3Text::
 	text "How is my old"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 
 	para "My @"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " is"
 	line "doing great!"
 	done
@@ -190,7 +194,7 @@ _NothingToCutText::
 	prompt
 
 _UsedCutText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " hacked"
 	line "away with CUT!"
 	prompt