Port pokecrystal's formatting of text commands and special characters

charmap.asm

@@ -1,265 +1,386 @@
-charmap "ガ", $05
+; $00-$17 are TX_* constants (see macros/scripts/text.asm)
-charmap "ギ", $06
-charmap "グ", $07
-charmap "ゲ", $08
-charmap "ゴ", $09
-charmap "ザ", $0A
-charmap "ジ", $0B
-charmap "ズ", $0C
-charmap "ゼ", $0D
-charmap "ゾ", $0E
-charmap "ダ", $0F
-charmap "ヂ", $10
-charmap "ヅ", $11
-charmap "デ", $12
-charmap "ド", $13
-charmap "バ", $19
-charmap "ビ", $1A
-charmap "ブ", $1B
-charmap "ボ", $1C
-charmap "が", $26
-charmap "ぎ", $27
-charmap "ぐ", $28
-charmap "げ", $29
-charmap "ご", $2A
-charmap "ざ", $2B
-charmap "じ", $2C
-charmap "ず", $2D
-charmap "ぜ", $2E
-charmap "ぞ", $2F
-charmap "だ", $30
-charmap "ぢ", $31
-charmap "づ", $32
-charmap "で", $33
-charmap "ど", $34
-charmap "ば", $3A
-charmap "び", $3B
-charmap "ぶ", $3C
-charmap "べ", $3D
-charmap "ぼ", $3E
-charmap "パ", $40
-charmap "ピ", $41
-charmap "プ", $42
-charmap "ポ", $43
-charmap "ぱ", $44
-charmap "ぴ", $45
-charmap "ぷ", $46
-charmap "ぺ", $47
-charmap "ぽ", $48
-charmap "ア", $80
-charmap "イ", $81
-charmap "ウ", $82
-charmap "エ", $83
-charmap "ォ", $84
-charmap "カ", $85
-charmap "キ", $86
-charmap "ク", $87
-charmap "ケ", $88
-charmap "コ", $89
-charmap "サ", $8A
-charmap "シ", $8B
-charmap "ス", $8C
-charmap "セ", $8D
-charmap "ソ", $8E
-charmap "タ", $8F
-charmap "チ", $90
-charmap "ツ", $91
-charmap "テ", $92
-charmap "ト", $93
-charmap "ナ", $94
-charmap "ニ", $95
-charmap "ヌ", $96
-charmap "ネ", $97
-charmap "ノ", $98
-charmap "ハ", $99
-charmap "ヒ", $9A
-charmap "フ", $9B
-charmap "ホ", $9C
-charmap "マ", $9D
-charmap "ミ", $9E
-charmap "ム", $9F
-charmap "メ", $A0
-charmap "モ", $A1
-charmap "ヤ", $A2
-charmap "ユ", $A3
-charmap "ヨ", $A4
-charmap "ラ", $A5
-charmap "ル", $A6
-charmap "レ", $A7
-charmap "ロ", $A8
-charmap "ワ", $A9
-charmap "ヲ", $AA
-charmap "ン", $AB
-charmap "ッ", $AC
-charmap "ャ", $AD
-charmap "ュ", $AE
-charmap "ョ", $AF
-charmap "ィ", $B0
-charmap "あ", $B1
-charmap "い", $B2
-charmap "う", $B3
-charmap "え", $B4
-charmap "お", $B5
-charmap "か", $B6
-charmap "き", $B7
-charmap "く", $B8
-charmap "け", $B9
-charmap "こ", $BA
-charmap "さ", $BB
-charmap "し", $BC
-charmap "す", $BD
-charmap "せ", $BE
-charmap "そ", $BF
-charmap "た", $C0
-charmap "ち", $C1
-charmap "つ", $C2
-charmap "て", $C3
-charmap "と", $C4
-charmap "な", $C5
-charmap "に", $C6
-charmap "ぬ", $C7
-charmap "ね", $C8
-charmap "の", $C9
-charmap "は", $CA
-charmap "ひ", $CB
-charmap "ふ", $CC
-charmap "へ", $CD
-charmap "ほ", $CE
-charmap "ま", $CF
-charmap "み", $D0
-charmap "む", $D1
-charmap "め", $D2
-charmap "も", $D3
-charmap "や", $D4
-charmap "ゆ", $D5
-charmap "よ", $D6
-charmap "ら", $D7
-charmap "り", $D8
-charmap "る", $D9
-charmap "れ", $DA
-charmap "ろ", $DB
-charmap "わ", $DC
-charmap "を", $DD
-charmap "ん", $DE
-charmap "っ", $DF
-charmap "ゃ", $E0
-charmap "ゅ", $E1
-charmap "ょ", $E2
-charmap "ー", $E3
 
-charmap "<pkmn>", $4A ; PkMn
+; Control characters (see home/text.asm)
-charmap "@", $50
-charmap "<PLAYER>", $52
-charmap "<RIVAL>", $53
-charmap "#", $54
-;charmap "POKé", $54
-charmap "<TARGET>", $59
-charmap "<USER>", $5A
-charmap "′", $71
-charmap "″", $73
-charmap "№", $74
-charmap "…", $75
 
-charmap "┌", $79
+	charmap "<NULL>",    $00
-charmap "─", $7A
+	charmap "<PAGE>",    $49
-charmap "┐", $7B
+	charmap "<PKMN>",    $4a ; "<PK><MN>"
-charmap "│", $7C
+	charmap "<_CONT>",   $4b ; implements "<CONT>"
-charmap "└", $7D
+	charmap "<SCROLL>",  $4c
-charmap "┘", $7E
+	charmap "<NEXT>",    $4e
+	charmap "<LINE>",    $4f
+	charmap "@",         $50 ; string terminator
+	charmap "<PARA>",    $51
+	charmap "<PLAYER>",  $52 ; wPlayerName
+	charmap "<RIVAL>",   $53 ; wRivalName
+	charmap "#",         $54 ; "POKé"
+	charmap "<CONT>",    $55
+	charmap "<……>",      $56 ; "……"
+	charmap "<DONE>",    $57
+	charmap "<PROMPT>",  $58
+	charmap "<TARGET>",  $59
+	charmap "<USER>",    $5a
+	charmap "<PC>",      $5b ; "PC"
+	charmap "<TM>",      $5c ; "TM"
+	charmap "<TRAINER>", $5d ; "TRAINER"
+	charmap "<ROCKET>",  $5e ; "ROCKET"
+	charmap "<DEXEND>",  $5f
 
-charmap " ", $7F
+; Actual characters (from gfx/font/font_extra.png)
-charmap "A", $80
-charmap "B", $81
-charmap "C", $82
-charmap "D", $83
-charmap "E", $84
-charmap "F", $85
-charmap "G", $86
-charmap "H", $87
-charmap "I", $88
-charmap "J", $89
-charmap "K", $8A
-charmap "L", $8B
-charmap "M", $8C
-charmap "N", $8D
-charmap "O", $8E
-charmap "P", $8F
-charmap "Q", $90
-charmap "R", $91
-charmap "S", $92
-charmap "T", $93
-charmap "U", $94
-charmap "V", $95
-charmap "W", $96
-charmap "X", $97
-charmap "Y", $98
-charmap "Z", $99
-charmap "(", $9A
-charmap ")", $9B
-charmap ":", $9C
-charmap ";", $9D
-charmap "[", $9E
-charmap "]", $9F
-charmap "a", $A0
-charmap "b", $A1
-charmap "c", $A2
-charmap "d", $A3
-charmap "e", $A4
-charmap "f", $A5
-charmap "g", $A6
-charmap "h", $A7
-charmap "i", $A8
-charmap "j", $A9
-charmap "k", $AA
-charmap "l", $AB
-charmap "m", $AC
-charmap "n", $AD
-charmap "o", $AE
-charmap "p", $AF
-charmap "q", $B0
-charmap "r", $B1
-charmap "s", $B2
-charmap "t", $B3
-charmap "u", $B4
-charmap "v", $B5
-charmap "w", $B6
-charmap "x", $B7
-charmap "y", $B8
-charmap "z", $B9
-charmap "é", $BA
-charmap "'d", $BB
-charmap "'l", $BC
-charmap "'s", $BD
-charmap "'t", $BE
-charmap "'v", $BF
 
-charmap "'", $E0
+	charmap "<BOLD_A>",  $60 ; unused
+	charmap "<BOLD_B>",  $61 ; unused
+	charmap "<BOLD_C>",  $62 ; unused
+	charmap "<BOLD_D>",  $63 ; unused
+	charmap "<BOLD_E>",  $64 ; unused
+	charmap "<BOLD_F>",  $65 ; unused
+	charmap "<BOLD_G>",  $66 ; unused
+	charmap "<BOLD_H>",  $67 ; unused
+	charmap "<BOLD_I>",  $68 ; unused
+	charmap "<BOLD_V>",  $69
+	charmap "<BOLD_S>",  $6a
+	charmap "<BOLD_L>",  $6b ; unused
+	charmap "<BOLD_M>",  $6c ; unused
+	charmap "<COLON>",   $6d ; colon with tinier dots than ":"
+	charmap "ぃ",         $6e ; hiragana small i, unused
+	charmap "ぅ",         $6f ; hiragana small u, unused
+	charmap "‘",         $70 ; opening single quote
+	charmap "’",         $71 ; closing single quote
+	charmap "“",         $72 ; opening quote
+	charmap "”",         $73 ; closing quote
+	charmap "·",         $74 ; middle dot, unused
+	charmap "…",         $75 ; ellipsis
+	charmap "ぁ",         $76 ; hiragana small a, unused
+	charmap "ぇ",         $77 ; hiragana small e, unused
+	charmap "ぉ",         $78 ; hiragana small o, unused
 
-charmap "-", $E3
+	charmap "┌",         $79
-charmap "'r", $E4
+	charmap "─",         $7a
-charmap "'m", $E5
+	charmap "┐",         $7b
-charmap "?", $E6
+	charmap "│",         $7c
-charmap "!", $E7
+	charmap "└",         $7d
-charmap ".", $E8
+	charmap "┘",         $7e
+	charmap " ",         $7f
 
-charmap "▷", $EC
+; Actual characters (from gfx/font/font_battle_extra.png)
-charmap "▶", $ED
+
-charmap "▲", $ED
+	charmap "<LV>",      $6e
-charmap "▼", $EE
+
-charmap "♂", $EF
+	charmap "<to>",      $70 ; narrow "to"
-charmap "¥", $F0
+
-charmap "×", $F1
+	charmap "『",         $72 ; Japanese opening quote, unused
-charmap "⠄", $F2
+	charmap "<ID>",      $73
-charmap "/", $F3
+	charmap "№",         $74
-charmap ",", $F4
+
-charmap "♀", $F5
+; Actual characters (from other graphics files)
-charmap "0", $F6
+
-charmap "1", $F7
+	; needed for ShowPokedexDataInternal (see engine/menus/pokedex.asm)
-charmap "2", $F8
+	charmap "′",         $60 ; gfx/pokedex/pokedex.png
-charmap "3", $F9
+	charmap "″",         $61 ; gfx/pokedex/pokedex.png
-charmap "4", $FA
+
-charmap "5", $FB
+	; needed for StatusScreen (see engine/pokemon/status_screen.asm)
-charmap "6", $FC
+	charmap "<BOLD_P>",  $72 ; gfx/font/P.1bpp
-charmap "7", $FD
+
-charmap "8", $FE
+	; needed for LoadTownMap_Fly (see engine/items/town_map.asm)
-charmap "9", $FF
+	charmap "▲",         $ed ; gfx/town_map/up_arrow.1bpp
+
+	; needed for PrintAlphabet (see engine/menus/naming_screen.asm)
+	charmap "<ED>",      $f0 ; gfx/font/ED.1bpp
+
+; Actual characters (from gfx/font/font.png)
+
+	charmap "A",         $80
+	charmap "B",         $81
+	charmap "C",         $82
+	charmap "D",         $83
+	charmap "E",         $84
+	charmap "F",         $85
+	charmap "G",         $86
+	charmap "H",         $87
+	charmap "I",         $88
+	charmap "J",         $89
+	charmap "K",         $8a
+	charmap "L",         $8b
+	charmap "M",         $8c
+	charmap "N",         $8d
+	charmap "O",         $8e
+	charmap "P",         $8f
+	charmap "Q",         $90
+	charmap "R",         $91
+	charmap "S",         $92
+	charmap "T",         $93
+	charmap "U",         $94
+	charmap "V",         $95
+	charmap "W",         $96
+	charmap "X",         $97
+	charmap "Y",         $98
+	charmap "Z",         $99
+
+	charmap "(",         $9a
+	charmap ")",         $9b
+	charmap ":",         $9c
+	charmap ";",         $9d
+	charmap "[",         $9e
+	charmap "]",         $9f
+
+	charmap "a",         $a0
+	charmap "b",         $a1
+	charmap "c",         $a2
+	charmap "d",         $a3
+	charmap "e",         $a4
+	charmap "f",         $a5
+	charmap "g",         $a6
+	charmap "h",         $a7
+	charmap "i",         $a8
+	charmap "j",         $a9
+	charmap "k",         $aa
+	charmap "l",         $ab
+	charmap "m",         $ac
+	charmap "n",         $ad
+	charmap "o",         $ae
+	charmap "p",         $af
+	charmap "q",         $b0
+	charmap "r",         $b1
+	charmap "s",         $b2
+	charmap "t",         $b3
+	charmap "u",         $b4
+	charmap "v",         $b5
+	charmap "w",         $b6
+	charmap "x",         $b7
+	charmap "y",         $b8
+	charmap "z",         $b9
+
+	charmap "é",         $ba
+	charmap "'d",        $bb
+	charmap "'l",        $bc
+	charmap "'s",        $bd
+	charmap "'t",        $be
+	charmap "'v",        $bf
+
+	charmap "'",         $e0
+	charmap "<PK>",      $e1
+	charmap "<MN>",      $e2
+	charmap "-",         $e3
+
+	charmap "'r",        $e4
+	charmap "'m",        $e5
+
+	charmap "?",         $e6
+	charmap "!",         $e7
+	charmap ".",         $e8
+
+	charmap "ァ",         $e9 ; katakana small a, unused
+	charmap "ゥ",         $ea ; katakana small u, unused
+	charmap "ェ",         $eb ; katakana small e, unused
+
+	charmap "▷",         $ec
+	charmap "▶",         $ed
+	charmap "▼",         $ee
+	charmap "♂",         $ef
+	charmap "¥",         $f0
+	charmap "×",         $f1
+	charmap "<DOT>",     $f2 ; decimal point; same as "." in English
+	charmap "/",         $f3
+	charmap ",",         $f4
+	charmap "♀",         $f5
+
+	charmap "0",         $f6
+	charmap "1",         $f7
+	charmap "2",         $f8
+	charmap "3",         $f9
+	charmap "4",         $fa
+	charmap "5",         $fb
+	charmap "6",         $fc
+	charmap "7",         $fd
+	charmap "8",         $fe
+	charmap "9",         $ff
+
+
+; Japanese kana, for those bits of text that were not translated to English
+
+	charmap "ガ", $05
+	charmap "ギ", $06
+	charmap "グ", $07
+	charmap "ゲ", $08
+	charmap "ゴ", $09
+	charmap "ザ", $0a
+	charmap "ジ", $0b
+	charmap "ズ", $0c
+	charmap "ゼ", $0d
+	charmap "ゾ", $0e
+	charmap "ダ", $0f
+	charmap "ヂ", $10
+	charmap "ヅ", $11
+	charmap "デ", $12
+	charmap "ド", $13
+
+	charmap "バ", $19
+	charmap "ビ", $1a
+	charmap "ブ", $1b
+	charmap "ボ", $1c
+
+	charmap "が", $26
+	charmap "ぎ", $27
+	charmap "ぐ", $28
+	charmap "げ", $29
+	charmap "ご", $2a
+	charmap "ざ", $2b
+	charmap "じ", $2c
+	charmap "ず", $2d
+	charmap "ぜ", $2e
+	charmap "ぞ", $2f
+	charmap "だ", $30
+	charmap "ぢ", $31
+	charmap "づ", $32
+	charmap "で", $33
+	charmap "ど", $34
+
+	charmap "ば", $3a
+	charmap "び", $3b
+	charmap "ぶ", $3c
+	charmap "べ", $3d
+	charmap "ぼ", $3e
+
+	charmap "パ", $40
+	charmap "ピ", $41
+	charmap "プ", $42
+	charmap "ポ", $43
+	charmap "ぱ", $44
+	charmap "ぴ", $45
+	charmap "ぷ", $46
+	charmap "ぺ", $47
+	charmap "ぽ", $48
+
+	charmap "「", $70
+	charmap "」", $71
+	charmap "』", $73
+	charmap "⋯", $75
+
+	charmap "　", $7f
+
+	charmap "ア", $80
+	charmap "イ", $81
+	charmap "ウ", $82
+	charmap "エ", $83
+	charmap "ォ", $84
+	charmap "カ", $85
+	charmap "キ", $86
+	charmap "ク", $87
+	charmap "ケ", $88
+	charmap "コ", $89
+	charmap "サ", $8a
+	charmap "シ", $8b
+	charmap "ス", $8c
+	charmap "セ", $8d
+	charmap "ソ", $8e
+	charmap "タ", $8f
+	charmap "チ", $90
+	charmap "ツ", $91
+	charmap "テ", $92
+	charmap "ト", $93
+	charmap "ナ", $94
+	charmap "ニ", $95
+	charmap "ヌ", $96
+	charmap "ネ", $97
+	charmap "ノ", $98
+	charmap "ハ", $99
+	charmap "ヒ", $9a
+	charmap "フ", $9b
+	charmap "ホ", $9c
+	charmap "マ", $9d
+	charmap "ミ", $9e
+	charmap "ム", $9f
+	charmap "メ", $a0
+	charmap "モ", $a1
+	charmap "ヤ", $a2
+	charmap "ユ", $a3
+	charmap "ヨ", $a4
+	charmap "ラ", $a5
+	charmap "ル", $a6
+	charmap "レ", $a7
+	charmap "ロ", $a8
+	charmap "ワ", $a9
+	charmap "ヲ", $aa
+	charmap "ン", $ab
+	charmap "ッ", $ac
+	charmap "ャ", $ad
+	charmap "ュ", $ae
+	charmap "ョ", $af
+	charmap "ィ", $b0
+
+	charmap "あ", $b1
+	charmap "い", $b2
+	charmap "う", $b3
+	charmap "え", $b4
+	charmap "お", $b5
+	charmap "か", $b6
+	charmap "き", $b7
+	charmap "く", $b8
+	charmap "け", $b9
+	charmap "こ", $ba
+	charmap "さ", $bb
+	charmap "し", $bc
+	charmap "す", $bd
+	charmap "せ", $be
+	charmap "そ", $bf
+	charmap "た", $c0
+	charmap "ち", $c1
+	charmap "つ", $c2
+	charmap "て", $c3
+	charmap "と", $c4
+	charmap "な", $c5
+	charmap "に", $c6
+	charmap "ぬ", $c7
+	charmap "ね", $c8
+	charmap "の", $c9
+	charmap "は", $ca
+	charmap "ひ", $cb
+	charmap "ふ", $cc
+	charmap "へ", $cd
+	charmap "ほ", $ce
+	charmap "ま", $cf
+	charmap "み", $d0
+	charmap "む", $d1
+	charmap "め", $d2
+	charmap "も", $d3
+	charmap "や", $d4
+	charmap "ゆ", $d5
+	charmap "よ", $d6
+	charmap "ら", $d7
+	charmap "り", $d8
+	charmap "る", $d9
+	charmap "れ", $da
+	charmap "ろ", $db
+	charmap "わ", $dc
+	charmap "を", $dd
+	charmap "ん", $de
+	charmap "っ", $df
+	charmap "ゃ", $e0
+	charmap "ゅ", $e1
+	charmap "ょ", $e2
+
+	charmap "ー", $e3
+	charmap "ﾟ", $e4
+	charmap "ﾞ", $e5
+
+	charmap "？", $e6
+	charmap "！", $e7
+	charmap "。", $e8
+
+	charmap "円", $f0
+
+	charmap "．", $f2
+	charmap "／", $f3
+
+	charmap "ォ", $f4
+
+	charmap "０", $f6
+	charmap "１", $f7
+	charmap "２", $f8
+	charmap "３", $f9
+	charmap "４", $fa
+	charmap "５", $fb
+	charmap "６", $fc
+	charmap "７", $fd
+	charmap "８", $fe
+	charmap "９", $ff

constants/text_constants.asm

@@ -1,12 +1,6 @@
 NAME_LENGTH EQU 11
 ITEM_NAME_LENGTH EQU 13
 
-; special text IDs
-TEXT_MON_FAINTED      EQU $d0
-TEXT_BLACKED_OUT      EQU $d1
-TEXT_REPEL_WORE_OFF   EQU $d2
-TEXT_SAFARI_GAME_OVER EQU $d3
-
 ; PrintNumber
 BIT_MONEY_SIGN     EQU 5
 BIT_LEFT_ALIGN     EQU 6
@@ -15,3 +9,12 @@ BIT_LEADING_ZEROES EQU 7
 MONEY_SIGN EQU     (1 << BIT_MONEY_SIGN)
 LEFT_ALIGN EQU     (1 << BIT_LEFT_ALIGN)
 LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES)
+
+; special text IDs (see home/text_script.asm)
+	const_def $d0
+	const TEXT_MON_FAINTED      ; $d0
+	const TEXT_BLACKED_OUT      ; $d1
+	const TEXT_REPEL_WORE_OFF   ; $d2
+	const TEXT_SAFARI_GAME_OVER ; $d3
+
+TEXT_START_MENU EQU $00

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

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:

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@"

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

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_ram wcd6d
-	text ": @@"
+	text ": @"
+	text_end
 
 _NoNibbleText::
 	text "Not even a nibble!"
@@ -58,8 +60,9 @@ _PokeCenterSignText::
 _FoundItemText::
 	text "<PLAYER> found"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
-	text "!@@"
+	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_decimal hOaksAideRequirement, 1, 3
-	text ""
+	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_decimal hOaksAideNumMonsOwned, 1, 3
-	text ""
+	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_decimal hOaksAideRequirement, 1, 3
-	text ""
+	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_ram wOaksAideRewardItemName
-	text "!@@"
+	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

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_ram wTrainerName
-	text ""
+	text_start
 	line "used @"
-	TX_RAM wcd6d
+	text_ram wcd6d
-	text ""
+	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_ram wcd6d
-	text ""
+	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_decimal wDexRatingNumMonsSeen, 1, 3
-	text ""
+	text_start
 	line "         Owned:@"
-	TX_NUM wDexRatingNumMonsOwned, 1, 3
+	text_decimal wDexRatingNumMonsOwned, 1, 3
-	db "@"
+	text_end
 
 _DexRatingText::
-	text "#DEX Rating", $6d
+	text "#DEX Rating<COLON>"
 	done
 
 _GymStatueText1::
-	TX_RAM wGymCityName
+	text_ram wGymCityName
-	text ""
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
+	text_ram wGymLeaderName
-	text ""
+	text_start
 
 	para "WINNING TRAINERS:"
 	line "<RIVAL>"
 	done
 
 _GymStatueText2::
-	TX_RAM wGymCityName
+	text_ram wGymCityName
-	text ""
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
+	text_ram wGymLeaderName
-	text ""
+	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_ram wcd6d
-	text "!@@"
+	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_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	text " coins!@"
+	text_end
 
 _FoundHiddenCoins2Text::
 	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	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_ram wEnemyMonNick
-	text ""
+	text_start
 	line "ran!"
 	prompt
 
 _EnemyRanText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	text_start
 	line "ran!"
 	prompt
 
@@ -847,28 +859,28 @@ _HurtByLeechSeedText::
 
 _EnemyMonFaintedText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	text_start
 	line "fainted!"
 	prompt
 
 _MoneyForWinningText::
 	text "<PLAYER> got ¥@"
-	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text ""
+	text_start
 	line "for winning!"
 	prompt
 
 _TrainerDefeatedText::
 	text "<PLAYER> defeated"
 	line "@"
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text "!"
 	prompt
 
 _PlayerMonFaintedText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
-	text ""
+	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 ""
+	text_start
-	line "used @@"
+	line "used @"
+	text_end
 
 _Used2Text::
-	text ""
+	text_start
-	line "used @@"
+	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_ram wBattleMonNick
-	text ""
+	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_decimal wCurEnemyLVL, 1, 3
-	text "!@@"
+	text "!@"
+	text_end
 
 _WildMonAppearedText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	text_start
 	line "appeared!"
 	prompt
 
 _HookedMonAttackedText::
 	text "The hooked"
 	line "@"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	text_start
 	cont "attacked!"
 	prompt
 
 _EnemyAppearedText::
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	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_ram wBattleMonNick
-	text " @@"
+	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_ram wEnemyMonNick
-	text ""
+	text_start
 	line "is eating!"
 	prompt
 
 _SafariZoneAngryText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
-	text ""
+	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_ram wcd6d
-	text ""
+	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_ram wcd6d
-	text ""
+	text_start
 	line "woke up!"
 	done
 
 _FullHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "health returned!"
 	done
 
 _ReviveText::
-	TX_RAM wcd6d
+	text_ram wcd6d
-	text ""
+	text_start
 	line "is revitalized!"
 	done
 
 _RareCandyText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
+	text_decimal wCurEnemyLVL, 1, 3
-	text "!@@"
+	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::
+_TextIDErrorText::
-	TX_NUM hSpriteIndexOrTextID,1,2
+	text_decimal hSpriteIndexOrTextID, 1, 2
 	text " ERROR."
 	done
 
-_Char55Text::
+_ContCharText::
-	text $4B,"@@"
+	text "<_CONT>@"
+	text_end

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_ram wcf4b
-	text ""
+	text_start
 	line "stopped evolving!"
 	prompt
 
 _IsEvolvingText::
 	text "What? @"
-	TX_RAM wcf4b
+	text_ram wcf4b
-	text ""
+	text_start
 	line "is evolving!"
 	done
 
@@ -95,11 +96,13 @@ _FireDefrostedText::
 _MonsStatsRoseText::
 	text "<USER>'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
-	text "@@"
+	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_ram wcf4b
-	text "@@"
+	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
 

data/text/text_4.asm

@@ -4,8 +4,8 @@ _PokemartGreetingText::
 	done
 
 _PokemonFaintedText::
-	TX_RAM wcd6d
+	text_ram wcd6d
-	text ""
+	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_ram wcf4b
-	text "!@@"
+	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_ram wLearnMoveMonName
-	text ""
+	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_ram wLearnMoveMonName
-	text ""
+	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"

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_ram wcd6d
-	text "!@@"
+	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
 

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_ram wEnemyMonNick
-	text "!@@"
+	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_ram wcf4b
-	text ""
+	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
 

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_ram wInGameTradeReceiveMonName
-	text "!@@"
+	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_ram wInGameTradeGiveMonName
-	text ""
+	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

engine/battle/common_text.asm

@@ -71,28 +71,28 @@ PrintBeginningBattleText:
 	ret
 
 WildMonAppearedText:
-	TX_FAR _WildMonAppearedText
+	text_far _WildMonAppearedText
-	db "@"
+	text_end
 
 HookedMonAttackedText:
-	TX_FAR _HookedMonAttackedText
+	text_far _HookedMonAttackedText
-	db "@"
+	text_end
 
 EnemyAppearedText:
-	TX_FAR _EnemyAppearedText
+	text_far _EnemyAppearedText
-	db "@"
+	text_end
 
 TrainerWantsToFightText:
-	TX_FAR _TrainerWantsToFightText
+	text_far _TrainerWantsToFightText
-	db "@"
+	text_end
 
 UnveiledGhostText:
-	TX_FAR _UnveiledGhostText
+	text_far _UnveiledGhostText
-	db "@"
+	text_end
 
 GhostCantBeIDdText:
-	TX_FAR _GhostCantBeIDdText
+	text_far _GhostCantBeIDdText
-	db "@"
+	text_end
 
 PrintSendOutMonMessage:
 	ld hl, wEnemyMonHP
@@ -138,39 +138,39 @@ PrintSendOutMonMessage:
 	jp PrintText
 
 GoText:
-	TX_FAR _GoText
+	text_far _GoText
-	TX_ASM
+	text_asm
 	jr PrintPlayerMon1Text
 
 DoItText:
-	TX_FAR _DoItText
+	text_far _DoItText
-	TX_ASM
+	text_asm
 	jr PrintPlayerMon1Text
 
 GetmText:
-	TX_FAR _GetmText
+	text_far _GetmText
-	TX_ASM
+	text_asm
 	jr PrintPlayerMon1Text
 
 EnemysWeakText:
-	TX_FAR _EnemysWeakText
+	text_far _EnemysWeakText
-	TX_ASM
+	text_asm
 
 PrintPlayerMon1Text:
 	ld hl, PlayerMon1Text
 	ret
 
 PlayerMon1Text:
-	TX_FAR _PlayerMon1Text
+	text_far _PlayerMon1Text
-	db "@"
+	text_end
 
 RetreatMon:
 	ld hl, PlayerMon2Text
 	jp PrintText
 
 PlayerMon2Text:
-	TX_FAR _PlayerMon2Text
+	text_far _PlayerMon2Text
-	TX_ASM
+	text_asm
 	push de
 	push bc
 	ld hl, wEnemyMonHP + 1
@@ -220,18 +220,18 @@ PlayerMon2Text:
 	ret
 
 EnoughText:
-	TX_FAR _EnoughText
+	text_far _EnoughText
-	TX_ASM
+	text_asm
 	jr PrintComeBackText
 
 OKExclamationText:
-	TX_FAR _OKExclamationText
+	text_far _OKExclamationText
-	TX_ASM
+	text_asm
 	jr PrintComeBackText
 
 GoodText:
-	TX_FAR _GoodText
+	text_far _GoodText
-	TX_ASM
+	text_asm
 	jr PrintComeBackText
 
 PrintComeBackText:
@@ -239,5 +239,5 @@ PrintComeBackText:
 	ret
 
 ComeBackText:
-	TX_FAR _ComeBackText
+	text_far _ComeBackText
-	db "@"
+	text_end

engine/battle/core.asm

@@ -207,8 +207,8 @@ StartBattle:
 	jr EnemyRan ; if b was greater than the random value, the enemy runs
 
 .outOfSafariBallsText
-	TX_FAR _OutOfSafariBallsText
+	text_far _OutOfSafariBallsText
-	db "@"
+	text_end
 
 .playerSendOutFirstMon
 	xor a
@@ -270,12 +270,12 @@ EnemyRan:
 	jpab AnimationSlideEnemyMonOff
 
 WildRanText:
-	TX_FAR _WildRanText
+	text_far _WildRanText
-	db "@"
+	text_end
 
 EnemyRanText:
-	TX_FAR _EnemyRanText
+	text_far _EnemyRanText
-	db "@"
+	text_end
 
 MainInBattleLoop:
 	call ReadPlayerMonCurHPAndStatus
@@ -532,16 +532,16 @@ HandlePoisonBurnLeechSeed:
 	ret
 
 HurtByPoisonText:
-	TX_FAR _HurtByPoisonText
+	text_far _HurtByPoisonText
-	db "@"
+	text_end
 
 HurtByBurnText:
-	TX_FAR _HurtByBurnText
+	text_far _HurtByBurnText
-	db "@"
+	text_end
 
 HurtByLeechSeedText:
-	TX_FAR _HurtByLeechSeedText
+	text_far _HurtByLeechSeedText
-	db "@"
+	text_end
 
 ; decreases the mon's current HP by 1/16 of the Max HP (multiplied by number of toxic ticks if active)
 ; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch)
@@ -858,8 +858,8 @@ FaintEnemyPokemon:
 	jpab GainExperience
 
 EnemyMonFaintedText:
-	TX_FAR _EnemyMonFaintedText
+	text_far _EnemyMonFaintedText
-	db "@"
+	text_end
 
 EndLowHealthAlarm:
 ; This function is called when the player has the won the battle. It turns off
@@ -949,12 +949,12 @@ TrainerBattleVictory:
 	predef_jump AddBCDPredef
 
 MoneyForWinningText:
-	TX_FAR _MoneyForWinningText
+	text_far _MoneyForWinningText
-	db "@"
+	text_end
 
 TrainerDefeatedText:
-	TX_FAR _TrainerDefeatedText
+	text_far _TrainerDefeatedText
-	db "@"
+	text_end
 
 PlayBattleVictoryMusic:
 	push af
@@ -1044,8 +1044,8 @@ RemoveFaintedPlayerMon:
 	jp PrintText
 
 PlayerMonFaintedText:
-	TX_FAR _PlayerMonFaintedText
+	text_far _PlayerMonFaintedText
-	db "@"
+	text_end
 
 ; asks if you want to use next mon
 ; stores whether you ran in C flag
@@ -1078,8 +1078,8 @@ DoUseNextMonDialogue:
 	jp TryRunningFromBattle
 
 UseNextMonText:
-	TX_FAR _UseNextMonText
+	text_far _UseNextMonText
-	db "@"
+	text_end
 
 ; choose next player mon to send out
 ; stores whether enemy mon has no HP left in Z flag
@@ -1165,16 +1165,16 @@ HandlePlayerBlackOut:
 	ret
 
 Sony1WinText:
-	TX_FAR _Sony1WinText
+	text_far _Sony1WinText
-	db "@"
+	text_end
 
 PlayerBlackedOutText2:
-	TX_FAR _PlayerBlackedOutText2
+	text_far _PlayerBlackedOutText2
-	db "@"
+	text_end
 
 LinkBattleLostText:
-	TX_FAR _LinkBattleLostText
+	text_far _LinkBattleLostText
-	db "@"
+	text_end
 
 ; slides pic of fainted mon downwards until it disappears
 ; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing
@@ -1442,12 +1442,12 @@ EnemySendOutFirstMon:
 	jp SwitchPlayerMon
 
 TrainerAboutToUseText:
-	TX_FAR _TrainerAboutToUseText
+	text_far _TrainerAboutToUseText
-	db "@"
+	text_end
 
 TrainerSentOutText:
-	TX_FAR _TrainerSentOutText
+	text_far _TrainerSentOutText
-	db "@"
+	text_end
 
 ; tests if the player has any pokemon that are not fainted
 ; sets d = 0 if all fainted, d != 0 if some mons are still alive
@@ -1487,8 +1487,8 @@ HasMonFainted:
 	ret
 
 NoWillText:
-	TX_FAR _NoWillText
+	text_far _NoWillText
-	db "@"
+	text_end
 
 ; try to run from battle (hl = player speed, de = enemy speed)
 ; stores whether the attempt was successful in carry flag
@@ -1610,16 +1610,16 @@ TryRunningFromBattle:
 	ret
 
 CantEscapeText:
-	TX_FAR _CantEscapeText
+	text_far _CantEscapeText
-	db "@"
+	text_end
 
 NoRunningText:
-	TX_FAR _NoRunningText
+	text_far _NoRunningText
-	db "@"
+	text_end
 
 GotAwayText:
-	TX_FAR _GotAwayText
+	text_far _GotAwayText
-	db "@"
+	text_end
 
 ; copies from party data to battle mon data when sending out a new player mon
 LoadBattleMonFromParty:
@@ -2289,8 +2289,8 @@ UseBagItem:
 	ret
 
 ItemsCantBeUsedHereText:
-	TX_FAR _ItemsCantBeUsedHereText
+	text_far _ItemsCantBeUsedHereText
-	db "@"
+	text_end
 
 PartyMenuOrRockOrRun:
 	dec a ; was Run selected?
@@ -2434,8 +2434,8 @@ SwitchPlayerMon:
 	ret
 
 AlreadyOutText:
-	TX_FAR _AlreadyOutText
+	text_far _AlreadyOutText
-	db "@"
+	text_end
 
 BattleMenu_RunWasSelected:
 	call LoadScreenTilesFromBuffer1
@@ -2667,12 +2667,12 @@ SelectMenuItem:
 	jp MoveSelectionMenu
 
 MoveNoPPText:
-	TX_FAR _MoveNoPPText
+	text_far _MoveNoPPText
-	db "@"
+	text_end
 
 MoveDisabledText:
-	TX_FAR _MoveDisabledText
+	text_far _MoveDisabledText
-	db "@"
+	text_end
 
 WhichTechniqueString:
 	db "WHICH TECHNIQUE?@"
@@ -2744,8 +2744,8 @@ AnyMoveToSelect:
 	ret
 
 NoMovesLeftText:
-	TX_FAR _NoMovesLeftText
+	text_far _NoMovesLeftText
-	db "@"
+	text_end
 
 SwapMovesInMenu:
 	ld a, [wMenuItemToSwap]
@@ -3239,8 +3239,8 @@ MirrorMoveCheck:
 	jp ExecutePlayerMoveDone
 
 MultiHitText:
-	TX_FAR _MultiHitText
+	text_far _MultiHitText
-	db "@"
+	text_end
 
 ExecutePlayerMoveDone:
 	xor a
@@ -3269,12 +3269,12 @@ PrintGhostText:
 	ret
 
 ScaredText:
-	TX_FAR _ScaredText
+	text_far _ScaredText
-	db "@"
+	text_end
 
 GetOutText:
-	TX_FAR _GetOutText
+	text_far _GetOutText
-	db "@"
+	text_end
 
 IsGhostBattle:
 	ld a, [wIsInBattle]
@@ -3557,64 +3557,64 @@ CheckPlayerStatusConditions:
 	ret
 
 FastAsleepText:
-	TX_FAR _FastAsleepText
+	text_far _FastAsleepText
-	db "@"
+	text_end
 
 WokeUpText:
-	TX_FAR _WokeUpText
+	text_far _WokeUpText
-	db "@"
+	text_end
 
 IsFrozenText:
-	TX_FAR _IsFrozenText
+	text_far _IsFrozenText
-	db "@"
+	text_end
 
 FullyParalyzedText:
-	TX_FAR _FullyParalyzedText
+	text_far _FullyParalyzedText
-	db "@"
+	text_end
 
 FlinchedText:
-	TX_FAR _FlinchedText
+	text_far _FlinchedText
-	db "@"
+	text_end
 
 MustRechargeText:
-	TX_FAR _MustRechargeText
+	text_far _MustRechargeText
-	db "@"
+	text_end
 
 DisabledNoMoreText:
-	TX_FAR _DisabledNoMoreText
+	text_far _DisabledNoMoreText
-	db "@"
+	text_end
 
 IsConfusedText:
-	TX_FAR _IsConfusedText
+	text_far _IsConfusedText
-	db "@"
+	text_end
 
 HurtItselfText:
-	TX_FAR _HurtItselfText
+	text_far _HurtItselfText
-	db "@"
+	text_end
 
 ConfusedNoMoreText:
-	TX_FAR _ConfusedNoMoreText
+	text_far _ConfusedNoMoreText
-	db "@"
+	text_end
 
 SavingEnergyText:
-	TX_FAR _SavingEnergyText
+	text_far _SavingEnergyText
-	db "@"
+	text_end
 
 UnleashedEnergyText:
-	TX_FAR _UnleashedEnergyText
+	text_far _UnleashedEnergyText
-	db "@"
+	text_end
 
 ThrashingAboutText:
-	TX_FAR _ThrashingAboutText
+	text_far _ThrashingAboutText
-	db "@"
+	text_end
 
 AttackContinuesText:
-	TX_FAR _AttackContinuesText
+	text_far _AttackContinuesText
-	db "@"
+	text_end
 
 CantMoveText:
-	TX_FAR _CantMoveText
+	text_far _CantMoveText
-	db "@"
+	text_end
 
 PrintMoveIsDisabledText:
 	ld hl, wPlayerSelectedMove
@@ -3635,8 +3635,8 @@ PrintMoveIsDisabledText:
 	jp PrintText
 
 MoveIsDisabledText:
-	TX_FAR _MoveIsDisabledText
+	text_far _MoveIsDisabledText
-	db "@"
+	text_end
 
 HandleSelfConfusionDamage:
 	ld hl, HurtItselfText
@@ -3692,8 +3692,8 @@ PrintMonName1Text:
 ; this likely had to do with Japanese grammar that got translated,
 ; but the functionality didn't get removed
 MonName1Text:
-	TX_FAR _MonName1Text
+	text_far _MonName1Text
-	TX_ASM
+	text_asm
 	ld a, [hWhoseTurn]
 	and a
 	ld a, [wPlayerMoveNum]
@@ -3717,13 +3717,13 @@ MonName1Text:
 	ret
 
 Used1Text:
-	TX_FAR _Used1Text
+	text_far _Used1Text
-	TX_ASM
+	text_asm
 	jr PrintInsteadText
 
 Used2Text:
-	TX_FAR _Used2Text
+	text_far _Used2Text
-	TX_ASM
+	text_asm
 	; fall through
 
 PrintInsteadText:
@@ -3734,8 +3734,8 @@ PrintInsteadText:
 	ret
 
 InsteadText:
-	TX_FAR _InsteadText
+	text_far _InsteadText
-	TX_ASM
+	text_asm
 	; fall through
 
 PrintMoveName:
@@ -3743,8 +3743,8 @@ PrintMoveName:
 	ret
 
 _PrintMoveName:
-	TX_FAR _CF4BText
+	text_far _CF4BText
-	TX_ASM
+	text_asm
 	ld hl, ExclamationPointPointerTable
 	ld a, [wd11e] ; exclamation point num
 	add a
@@ -3766,24 +3766,24 @@ ExclamationPointPointerTable:
 	dw ExclamationPoint5Text
 
 ExclamationPoint1Text:
-	TX_FAR _ExclamationPoint1Text
+	text_far _ExclamationPoint1Text
-	db "@"
+	text_end
 
 ExclamationPoint2Text:
-	TX_FAR _ExclamationPoint2Text
+	text_far _ExclamationPoint2Text
-	db "@"
+	text_end
 
 ExclamationPoint3Text:
-	TX_FAR _ExclamationPoint3Text
+	text_far _ExclamationPoint3Text
-	db "@"
+	text_end
 
 ExclamationPoint4Text:
-	TX_FAR _ExclamationPoint4Text
+	text_far _ExclamationPoint4Text
-	db "@"
+	text_end
 
 ExclamationPoint5Text:
-	TX_FAR _ExclamationPoint5Text
+	text_far _ExclamationPoint5Text
-	db "@"
+	text_end
 
 ; this function does nothing useful
 ; if the move being used is in set [1-4] from ExclamationPointMoveSets,
@@ -3874,24 +3874,24 @@ PrintMoveFailureText:
 	jp ApplyDamageToEnemyPokemon
 
 AttackMissedText:
-	TX_FAR _AttackMissedText
+	text_far _AttackMissedText
-	db "@"
+	text_end
 
 KeptGoingAndCrashedText:
-	TX_FAR _KeptGoingAndCrashedText
+	text_far _KeptGoingAndCrashedText
-	db "@"
+	text_end
 
 UnaffectedText:
-	TX_FAR _UnaffectedText
+	text_far _UnaffectedText
-	db "@"
+	text_end
 
 PrintDoesntAffectText:
 	ld hl, DoesntAffectMonText
 	jp PrintText
 
 DoesntAffectMonText:
-	TX_FAR _DoesntAffectMonText
+	text_far _DoesntAffectMonText
-	db "@"
+	text_end
 
 ; if there was a critical hit or an OHKO was successful, print the corresponding text
 PrintCriticalOHKOText:
@@ -3919,12 +3919,12 @@ CriticalOHKOTextPointers:
 	dw OHKOText
 
 CriticalHitText:
-	TX_FAR _CriticalHitText
+	text_far _CriticalHitText
-	db "@"
+	text_end
 
 OHKOText:
-	TX_FAR _OHKOText
+	text_far _OHKOText
-	db "@"
+	text_end
 
 ; checks if a traded mon will disobey due to lack of badges
 ; stores whether the mon will use a move in Z flag
@@ -4108,24 +4108,24 @@ CheckForDisobedience:
 	ret
 
 LoafingAroundText:
-	TX_FAR _LoafingAroundText
+	text_far _LoafingAroundText
-	db "@"
+	text_end
 
 BeganToNapText:
-	TX_FAR _BeganToNapText
+	text_far _BeganToNapText
-	db "@"
+	text_end
 
 WontObeyText:
-	TX_FAR _WontObeyText
+	text_far _WontObeyText
-	db "@"
+	text_end
 
 TurnedAwayText:
-	TX_FAR _TurnedAwayText
+	text_far _TurnedAwayText
-	db "@"
+	text_end
 
 IgnoredOrdersText:
-	TX_FAR _IgnoredOrdersText
+	text_far _IgnoredOrdersText
-	db "@"
+	text_end
 
 ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon
 GetDamageVarsForPlayerAttack:
@@ -4997,12 +4997,12 @@ AttackSubstitute:
 	jp DrawHUDsAndHPBars
 
 SubstituteTookDamageText:
-	TX_FAR _SubstituteTookDamageText
+	text_far _SubstituteTookDamageText
-	db "@"
+	text_end
 
 SubstituteBrokeText:
-	TX_FAR _SubstituteBrokeText
+	text_far _SubstituteBrokeText
-	db "@"
+	text_end
 
 ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked
 HandleBuildingRage:
@@ -5048,8 +5048,8 @@ HandleBuildingRage:
 	ret
 
 BuildingRageText:
-	TX_FAR _BuildingRageText
+	text_far _BuildingRageText
-	db "@"
+	text_end
 
 ; copy last move for Mirror Move
 ; sets zero flag on failure and unsets zero flag on success
@@ -5084,8 +5084,8 @@ MirrorMoveCopyMove:
 	ret
 
 MirrorMoveFailedText:
-	TX_FAR _MirrorMoveFailedText
+	text_far _MirrorMoveFailedText
-	db "@"
+	text_end
 
 ; function used to reload move data for moves like Mirror Move and Metronome
 ReloadMoveData:
@@ -5759,8 +5759,8 @@ EnemyCheckIfMirrorMoveEffect:
 	jr ExecuteEnemyMoveDone
 
 HitXTimesText:
-	TX_FAR _HitXTimesText
+	text_far _HitXTimesText
-	db "@"
+	text_end
 
 ExecuteEnemyMoveDone:
 	ld b, $1
@@ -6626,6 +6626,7 @@ LoadHudTilePatterns:
 PrintEmptyString:
 	ld hl, .emptyString
 	jp PrintText
+
 .emptyString
 	db "@"
 

engine/battle/display_effectiveness.asm

@@ -10,9 +10,9 @@ DisplayEffectiveness:
 	jp PrintText
 
 SuperEffectiveText:
-	TX_FAR _SuperEffectiveText
+	text_far _SuperEffectiveText
-	db "@"
+	text_end
 
 NotVeryEffectiveText:
-	TX_FAR _NotVeryEffectiveText
+	text_far _NotVeryEffectiveText
-	db "@"
+	text_end

engine/battle/effects.asm

@@ -68,12 +68,12 @@ SleepEffect:
 	jp PrintDidntAffectText
 
 FellAsleepText:
-	TX_FAR _FellAsleepText
+	text_far _FellAsleepText
-	db "@"
+	text_end
 
 AlreadyAsleepText:
-	TX_FAR _AlreadyAsleepText
+	text_far _AlreadyAsleepText
-	db "@"
+	text_end
 
 PoisonEffect:
 	ld hl, wEnemyMonStatus
@@ -162,12 +162,12 @@ PoisonEffect:
 	jp PrintDidntAffectText
 
 PoisonedText:
-	TX_FAR _PoisonedText
+	text_far _PoisonedText
-	db "@"
+	text_end
 
 BadlyPoisonedText:
-	TX_FAR _BadlyPoisonedText
+	text_far _BadlyPoisonedText
-	db "@"
+	text_end
 
 DrainHPEffect:
 	jpab DrainHPEffect_
@@ -297,12 +297,12 @@ opponentAttacker:
 	jp PrintText
 
 BurnedText:
-	TX_FAR _BurnedText
+	text_far _BurnedText
-	db "@"
+	text_end
 
 FrozenText:
-	TX_FAR _FrozenText
+	text_far _FrozenText
-	db "@"
+	text_end
 
 CheckDefrost:
 ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
@@ -340,8 +340,8 @@ CheckDefrost:
 	jp PrintText
 
 FireDefrostedText:
-	TX_FAR _FireDefrostedText
+	text_far _FireDefrostedText
-	db "@"
+	text_end
 
 StatModifierUpEffect:
 	ld hl, wPlayerMonStatMods
@@ -508,8 +508,8 @@ PrintNothingHappenedText:
 	jp PrintText
 
 MonsStatsRoseText:
-	TX_FAR _MonsStatsRoseText
+	text_far _MonsStatsRoseText
-	TX_ASM
+	text_asm
 	ld hl, GreatlyRoseText
 	ld a, [hWhoseTurn]
 	and a
@@ -523,12 +523,12 @@ MonsStatsRoseText:
 	ret
 
 GreatlyRoseText:
-	TX_DELAY
+	text_pause
-	TX_FAR _GreatlyRoseText
+	text_far _GreatlyRoseText
 ; fallthrough
 RoseText:
-	TX_FAR _RoseText
+	text_far _RoseText
-	db "@"
+	text_end
 
 StatModifierDownEffect:
 	ld hl, wEnemyMonStatMods
@@ -710,8 +710,8 @@ MoveMissed:
 	jp ConditionalPrintButItFailed
 
 MonsStatsFellText:
-	TX_FAR _MonsStatsFellText
+	text_far _MonsStatsFellText
-	TX_ASM
+	text_asm
 	ld hl, FellText
 	ld a, [hWhoseTurn]
 	and a
@@ -728,12 +728,12 @@ MonsStatsFellText:
 	ret
 
 GreatlyFellText:
-	TX_DELAY
+	text_pause
-	TX_FAR _GreatlyFellText
+	text_far _GreatlyFellText
 ; fallthrough
 FellText:
-	TX_FAR _FellText
+	text_far _FellText
-	db "@"
+	text_end
 
 PrintStatText:
 	ld hl, StatsTextStrings
@@ -905,16 +905,16 @@ SwitchAndTeleportEffect:
 	jp PrintText
 
 RanFromBattleText:
-	TX_FAR _RanFromBattleText
+	text_far _RanFromBattleText
-	db "@"
+	text_end
 
 RanAwayScaredText:
-	TX_FAR _RanAwayScaredText
+	text_far _RanAwayScaredText
-	db "@"
+	text_end
 
 WasBlownAwayText:
-	TX_FAR _WasBlownAwayText
+	text_far _WasBlownAwayText
-	db "@"
+	text_end
 
 TwoToFiveAttacksEffect:
 	ld hl, wPlayerBattleStatus1
@@ -1024,8 +1024,8 @@ ChargeEffect:
 	jp PrintText
 
 ChargeMoveEffectText:
-	TX_FAR _ChargeMoveEffectText
+	text_far _ChargeMoveEffectText
-	TX_ASM
+	text_asm
 	ld a, [wChargeMoveNum]
 	cp RAZOR_WIND
 	ld hl, MadeWhirlwindText
@@ -1048,28 +1048,28 @@ ChargeMoveEffectText:
 	ret
 
 MadeWhirlwindText:
-	TX_FAR _MadeWhirlwindText
+	text_far _MadeWhirlwindText
-	db "@"
+	text_end
 
 TookInSunlightText:
-	TX_FAR _TookInSunlightText
+	text_far _TookInSunlightText
-	db "@"
+	text_end
 
 LoweredItsHeadText:
-	TX_FAR _LoweredItsHeadText
+	text_far _LoweredItsHeadText
-	db "@"
+	text_end
 
 SkyAttackGlowingText:
-	TX_FAR _SkyAttackGlowingText
+	text_far _SkyAttackGlowingText
-	db "@"
+	text_end
 
 FlewUpHighText:
-	TX_FAR _FlewUpHighText
+	text_far _FlewUpHighText
-	db "@"
+	text_end
 
 DugAHoleText:
-	TX_FAR _DugAHoleText
+	text_far _DugAHoleText
-	db "@"
+	text_end
 
 TrappingEffect:
 	ld hl, wPlayerBattleStatus1
@@ -1146,8 +1146,8 @@ ConfusionSideEffectSuccess:
 	jp PrintText
 
 BecameConfusedText:
-	TX_FAR _BecameConfusedText
+	text_far _BecameConfusedText
-	db "@"
+	text_end
 
 ConfusionEffectFailed:
 	cp CONFUSION_SIDE_EFFECT
@@ -1267,8 +1267,8 @@ MimicEffect:
 	jp PrintButItFailedText_
 
 MimicLearnedMoveText:
-	TX_FAR _MimicLearnedMoveText
+	text_far _MimicLearnedMoveText
-	db "@"
+	text_end
 
 LeechSeedEffect:
 	jpab LeechSeedEffect_
@@ -1361,8 +1361,8 @@ DisableEffect:
 	jp PrintButItFailedText_
 
 MoveWasDisabledText:
-	TX_FAR _MoveWasDisabledText
+	text_far _MoveWasDisabledText
-	db "@"
+	text_end
 
 PayDayEffect:
 	jpab PayDayEffect_
@@ -1383,16 +1383,16 @@ ReflectLightScreenEffect:
 	jpab ReflectLightScreenEffect_
 
 NothingHappenedText:
-	TX_FAR _NothingHappenedText
+	text_far _NothingHappenedText
-	db "@"
+	text_end
 
 PrintNoEffectText:
 	ld hl, NoEffectText
 	jp PrintText
 
 NoEffectText:
-	TX_FAR _NoEffectText
+	text_far _NoEffectText
-	db "@"
+	text_end
 
 ConditionalPrintButItFailed:
 	ld a, [wMoveDidntMiss]
@@ -1404,28 +1404,28 @@ PrintButItFailedText_:
 	jp PrintText
 
 ButItFailedText:
-	TX_FAR _ButItFailedText
+	text_far _ButItFailedText
-	db "@"
+	text_end
 
 PrintDidntAffectText:
 	ld hl, DidntAffectText
 	jp PrintText
 
 DidntAffectText:
-	TX_FAR _DidntAffectText
+	text_far _DidntAffectText
-	db "@"
+	text_end
 
 IsUnaffectedText:
-	TX_FAR _IsUnaffectedText
+	text_far _IsUnaffectedText
-	db "@"
+	text_end
 
 PrintMayNotAttackText:
 	ld hl, ParalyzedMayNotAttackText
 	jp PrintText
 
 ParalyzedMayNotAttackText:
-	TX_FAR _ParalyzedMayNotAttackText
+	text_far _ParalyzedMayNotAttackText
-	db "@"
+	text_end
 
 CheckTargetSubstitute:
 	push hl

engine/battle/end_of_battle.asm

@@ -84,5 +84,5 @@ DrawText:
 	db "  DRAW@"
 
 PickUpPayDayMoneyText:
-	TX_FAR _PickUpPayDayMoneyText
+	text_far _PickUpPayDayMoneyText
-	db "@"
+	text_end

engine/battle/experience.asm

@@ -340,8 +340,8 @@ BoostExp:
 	ret
 
 GainedText:
-	TX_FAR _GainedText
+	text_far _GainedText
-	TX_ASM
+	text_asm
 	ld a, [wBoostExpByExpAll]
 	ld hl, WithExpAllText
 	and a
@@ -354,19 +354,19 @@ GainedText:
 	ret
 
 WithExpAllText:
-	TX_FAR _WithExpAllText
+	text_far _WithExpAllText
-	TX_ASM
+	text_asm
 	ld hl, ExpPointsText
 	ret
 
 BoostedText:
-	TX_FAR _BoostedText
+	text_far _BoostedText
 
 ExpPointsText:
-	TX_FAR _ExpPointsText
+	text_far _ExpPointsText
-	db "@"
+	text_end
 
 GrewLevelText:
-	TX_FAR _GrewLevelText
+	text_far _GrewLevelText
-	TX_SFX_LEVEL_UP
+	sound_level_up
-	db "@"
+	text_end

engine/battle/move_effects/conversion.asm

@@ -25,8 +25,8 @@ ConversionEffect_:
 	jp PrintText
 
 ConvertedTypeText:
-	TX_FAR _ConvertedTypeText
+	text_far _ConvertedTypeText
-	db "@"
+	text_end
 
 PrintButItFailedText:
 	ld hl, PrintButItFailedText_

engine/battle/move_effects/drain_hp.asm

@@ -96,9 +96,9 @@ DrainHPEffect_:
 	jp PrintText
 
 SuckedHealthText:
-	TX_FAR _SuckedHealthText
+	text_far _SuckedHealthText
-	db "@"
+	text_end
 
 DreamWasEatenText:
-	TX_FAR _DreamWasEatenText
+	text_far _DreamWasEatenText
-	db "@"
+	text_end

engine/battle/move_effects/focus_energy.asm

@@ -17,6 +17,6 @@ FocusEnergyEffect_:
 	jpab PrintButItFailedText_
 
 GettingPumpedText:
-	TX_DELAY
+	text_pause
-	TX_FAR _GettingPumpedText
+	text_far _GettingPumpedText
-	db "@"
+	text_end

engine/battle/move_effects/haze.asm

@@ -77,5 +77,5 @@ ResetStats:
 	ret
 
 StatusChangesEliminatedText:
-	TX_FAR _StatusChangesEliminatedText
+	text_far _StatusChangesEliminatedText
-	db "@"
+	text_end

engine/battle/move_effects/heal.asm

@@ -108,13 +108,13 @@ HealEffect_:
 	jp BankswitchEtoF
 
 StartedSleepingEffect:
-	TX_FAR _StartedSleepingEffect
+	text_far _StartedSleepingEffect
-	db "@"
+	text_end
 
 FellAsleepBecameHealthyText:
-	TX_FAR _FellAsleepBecameHealthyText
+	text_far _FellAsleepBecameHealthyText
-	db "@"
+	text_end
 
 RegainedHealthText:
-	TX_FAR _RegainedHealthText
+	text_far _RegainedHealthText
-	db "@"
+	text_end

engine/battle/move_effects/leech_seed.asm

@@ -32,9 +32,9 @@ LeechSeedEffect_:
 	jp PrintText
 
 WasSeededText:
-	TX_FAR _WasSeededText
+	text_far _WasSeededText
-	db "@"
+	text_end
 
 EvadedAttackText:
-	TX_FAR _EvadedAttackText
+	text_far _EvadedAttackText
-	db "@"
+	text_end

engine/battle/move_effects/mist.asm

@@ -15,5 +15,5 @@ MistEffect_:
 	jpab PrintButItFailedText_
 
 ShroudedInMistText:
-	TX_FAR _ShroudedInMistText
+	text_far _ShroudedInMistText
-	db "@"
+	text_end

engine/battle/move_effects/pay_day.asm

@@ -41,5 +41,5 @@ PayDayEffect_:
 	jp PrintText
 
 CoinsScatteredText:
-	TX_FAR _CoinsScatteredText
+	text_far _CoinsScatteredText
-	db "@"
+	text_end

engine/battle/move_effects/recoil.asm

@@ -66,5 +66,5 @@ RecoilEffect_:
 	ld hl, HitWithRecoilText
 	jp PrintText
 HitWithRecoilText:
-	TX_FAR _HitWithRecoilText
+	text_far _HitWithRecoilText
-	db "@"
+	text_end

engine/battle/move_effects/reflect_light_screen.asm

@@ -33,12 +33,12 @@ ReflectLightScreenEffect_:
 	jp BankswitchEtoF
 
 LightScreenProtectedText:
-	TX_FAR _LightScreenProtectedText
+	text_far _LightScreenProtectedText
-	db "@"
+	text_end
 
 ReflectGainedArmorText:
-	TX_FAR _ReflectGainedArmorText
+	text_far _ReflectGainedArmorText
-	db "@"
+	text_end
 
 BankswitchEtoF:
 	ld b, BANK(BattleCore)

engine/battle/move_effects/substitute.asm

@@ -65,13 +65,13 @@ SubstituteEffect_:
 	jp PrintText
 
 SubstituteText:
-	TX_FAR _SubstituteText
+	text_far _SubstituteText
-	db "@"
+	text_end
 
 HasSubstituteText:
-	TX_FAR _HasSubstituteText
+	text_far _HasSubstituteText
-	db "@"
+	text_end
 
 TooWeakSubstituteText:
-	TX_FAR _TooWeakSubstituteText
+	text_far _TooWeakSubstituteText
-	db "@"
+	text_end

engine/battle/move_effects/transform.asm

@@ -144,5 +144,5 @@ TransformEffect_:
 	jp BankswitchEtoF
 
 TransformedText:
-	TX_FAR _TransformedText
+	text_far _TransformedText
-	db "@"
+	text_end

engine/battle/safari_zone.asm

@@ -28,9 +28,9 @@ PrintSafariZoneBattleText:
 	jp PrintText
 
 SafariZoneEatingText:
-	TX_FAR _SafariZoneEatingText
+	text_far _SafariZoneEatingText
-	db "@"
+	text_end
 
 SafariZoneAngryText:
-	TX_FAR _SafariZoneAngryText
+	text_far _SafariZoneAngryText
-	db "@"
+	text_end

engine/battle/trainer_ai.asm

@@ -610,8 +610,8 @@ SwitchEnemyMon:
 	ret
 
 AIBattleWithdrawText:
-	TX_FAR _AIBattleWithdrawText
+	text_far _AIBattleWithdrawText
-	db "@"
+	text_end
 
 AIUseFullHeal:
 	call AIPlayRestoringSFX
@@ -735,5 +735,5 @@ AIPrintItemUse_:
 	jp PrintText
 
 AIBattleUseItemText:
-	TX_FAR _AIBattleUseItemText
+	text_far _AIBattleUseItemText
-	db "@"
+	text_end

engine/events/card_key.asm

@@ -72,14 +72,14 @@ SilphCoMapList:
 	db $FF
 
 CardKeySuccessText::
-	TX_FAR _CardKeySuccessText1
+	text_far _CardKeySuccessText1
-	TX_SFX_ITEM_1
+	sound_get_item_1
-	TX_FAR _CardKeySuccessText2
+	text_far _CardKeySuccessText2
-	db "@"
+	text_end
 
 CardKeyFailText::
-	TX_FAR _CardKeyFailText
+	text_far _CardKeyFailText
-	db "@"
+	text_end
 
 ; d = Y
 ; e = X

engine/events/cinnabar_lab.asm

@@ -73,20 +73,20 @@ GiveFossilToCinnabarLab::
 	ret
 
 LabFossil_610ae:
-	TX_FAR _Lab4Text_610ae
+	text_far _Lab4Text_610ae
-	db "@"
+	text_end
 
 LabFossil_610b3:
-	TX_FAR _Lab4Text_610b3
+	text_far _Lab4Text_610b3
-	db "@"
+	text_end
 
 LabFossil_610b8:
-	TX_FAR _Lab4Text_610b8
+	text_far _Lab4Text_610b8
-	db "@"
+	text_end
 
 LabFossil_610bd:
-	TX_FAR _Lab4Text_610bd
+	text_far _Lab4Text_610bd
-	db "@"
+	text_end
 
 PrintFossilsInBag:
 ; Prints each fossil in the player's bag on a separate line in the menu.

engine/events/diploma.asm

@@ -1,3 +1,5 @@
+CIRCLE_TILE_ID EQU $70
+
 DisplayDiploma::
 	call SaveScreenTilesToBuffer2
 	call GBPalWhiteOutWithDelay3
@@ -8,7 +10,7 @@ DisplayDiploma::
 	set 6, [hl]
 	call DisableLCD
 	ld hl, CircleTile
-	ld de, vChars2 + $700
+	ld de, vChars2 + CIRCLE_TILE_ID * $10
 	ld bc, $10
 	ld a, BANK(CircleTile)
 	call FarCopyData2
@@ -94,7 +96,7 @@ DiplomaTextPointersAndCoords:
 	dwCoord 9, 16
 
 DiplomaText:
-	db $70,"Diploma",$70,"@"
+	db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@"
 
 DiplomaPlayer:
 	db "Player@"

engine/events/elevator.asm

@@ -44,5 +44,5 @@ DisplayElevatorFloorMenu:
 	ret
 
 WhichFloorText:
-	TX_FAR _WhichFloorText
+	text_far _WhichFloorText
-	db "@"
+	text_end

engine/events/give_pokemon.asm

@@ -69,14 +69,14 @@ SetPokedexOwnedFlag:
 	jp PrintText
 
 GotMonText:
-	TX_FAR _GotMonText
+	text_far _GotMonText
-	TX_SFX_ITEM_1
+	sound_get_item_1
-	db "@"
+	text_end
 
 SentToBoxText:
-	TX_FAR _SentToBoxText
+	text_far _SentToBoxText
-	db "@"
+	text_end
 
 BoxIsFullText:
-	TX_FAR _BoxIsFullText
+	text_far _BoxIsFullText
-	db "@"
+	text_end

engine/events/hidden_items.asm

@@ -21,8 +21,8 @@ HiddenItems:
 INCLUDE "data/events/hidden_item_coords.asm"
 
 FoundHiddenItemText::
-	TX_FAR _FoundHiddenItemText
+	text_far _FoundHiddenItemText
-	TX_ASM
+	text_asm
 	ld a, [wHiddenObjectFunctionArgument] ; item ID
 	ld b, a
 	ld c, 1
@@ -46,8 +46,8 @@ FoundHiddenItemText::
 	jp TextScriptEnd
 
 HiddenItemBagFullText::
-	TX_FAR _HiddenItemBagFullText
+	text_far _HiddenItemBagFullText
-	db "@"
+	text_end
 
 HiddenCoins:
 	ld b, COIN_CASE
@@ -121,15 +121,15 @@ HiddenCoins:
 INCLUDE "data/events/hidden_coins.asm"
 
 FoundHiddenCoinsText::
-	TX_FAR _FoundHiddenCoinsText
+	text_far _FoundHiddenCoinsText
-	TX_SFX_ITEM_2
+	sound_get_item_2
-	db "@"
+	text_end
 
 DroppedHiddenCoinsText::
-	TX_FAR _FoundHiddenCoins2Text
+	text_far _FoundHiddenCoins2Text
-	TX_SFX_ITEM_2
+	sound_get_item_2
-	TX_FAR _DroppedHiddenCoinsText
+	text_far _DroppedHiddenCoinsText
-	db "@"
+	text_end
 
 FindHiddenItemOrCoinsIndex:
 	ld a, [wHiddenObjectY]

engine/events/hidden_objects/bench_guys.asm

@@ -50,59 +50,59 @@ BenchGuyTextPointers:
 	db $FF
 
 ViridianCityPokecenterBenchGuyText::
-	TX_FAR _ViridianCityPokecenterGuyText
+	text_far _ViridianCityPokecenterGuyText
-	db "@"
+	text_end
 
 PewterCityPokecenterBenchGuyText::
-	TX_FAR _PewterCityPokecenterGuyText
+	text_far _PewterCityPokecenterGuyText
-	db "@"
+	text_end
 
 CeruleanCityPokecenterBenchGuyText::
-	TX_FAR _CeruleanPokecenterGuyText
+	text_far _CeruleanPokecenterGuyText
-	db "@"
+	text_end
 
 LavenderCityPokecenterBenchGuyText::
-	TX_FAR _LavenderPokecenterGuyText
+	text_far _LavenderPokecenterGuyText
-	db "@"
+	text_end
 
 MtMoonPokecenterBenchGuyText::
-	TX_FAR _MtMoonPokecenterBenchGuyText
+	text_far _MtMoonPokecenterBenchGuyText
-	db "@"
+	text_end
 
 RockTunnelPokecenterBenchGuyText::
-	TX_FAR _RockTunnelPokecenterGuyText
+	text_far _RockTunnelPokecenterGuyText
-	db "@"
+	text_end
 
 UnusedBenchGuyText1::
-	TX_FAR _UnusedBenchGuyText1
+	text_far _UnusedBenchGuyText1
-	db "@"
+	text_end
 
 UnusedBenchGuyText2::
-	TX_FAR _UnusedBenchGuyText2
+	text_far _UnusedBenchGuyText2
-	db "@"
+	text_end
 
 UnusedBenchGuyText3::
-	TX_FAR _UnusedBenchGuyText3
+	text_far _UnusedBenchGuyText3
-	db "@"
+	text_end
 
 VermilionCityPokecenterBenchGuyText::
-	TX_FAR _VermilionPokecenterGuyText
+	text_far _VermilionPokecenterGuyText
-	db "@"
+	text_end
 
 CeladonCityPokecenterBenchGuyText::
-	TX_FAR _CeladonCityPokecenterGuyText
+	text_far _CeladonCityPokecenterGuyText
-	db "@"
+	text_end
 
 FuchsiaCityPokecenterBenchGuyText::
-	TX_FAR _FuchsiaCityPokecenterGuyText
+	text_far _FuchsiaCityPokecenterGuyText
-	db "@"
+	text_end
 
 CinnabarIslandPokecenterBenchGuyText::
-	TX_FAR _CinnabarPokecenterGuyText
+	text_far _CinnabarPokecenterGuyText
-	db "@"
+	text_end
 
 SaffronCityPokecenterBenchGuyText::
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ld hl, SaffronCityPokecenterBenchGuyText2
 	jr nz, .asm_624f2
@@ -112,13 +112,13 @@ SaffronCityPokecenterBenchGuyText::
 	jp TextScriptEnd
 
 SaffronCityPokecenterBenchGuyText1:
-	TX_FAR _SaffronCityPokecenterGuyText1
+	text_far _SaffronCityPokecenterGuyText1
-	db "@"
+	text_end
 
 SaffronCityPokecenterBenchGuyText2:
-	TX_FAR _SaffronCityPokecenterGuyText2
+	text_far _SaffronCityPokecenterGuyText2
-	db "@"
+	text_end
 
 CeladonCityHotelText::
-	TX_FAR _CeladonCityHotelText
+	text_far _CeladonCityHotelText
-	db "@"
+	text_end

engine/events/hidden_objects/bills_house_pc.asm

@@ -45,13 +45,13 @@ BillsHousePC:
 	ret
 
 BillsHouseMonitorText::
-	TX_FAR _BillsHouseMonitorText
+	text_far _BillsHouseMonitorText
-	db "@"
+	text_end
 
 BillsHouseInitiatedText::
-	TX_FAR _BillsHouseInitiatedText
+	text_far _BillsHouseInitiatedText
-	TX_BLINK
+	text_promptbutton
-	TX_ASM
+	text_asm
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
 	call PlaySound
@@ -65,7 +65,7 @@ BillsHouseInitiatedText::
 	jp TextScriptEnd
 
 BillsHousePokemonList::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, BillsHousePokemonListText1
 	call PrintText
@@ -119,8 +119,8 @@ BillsHousePokemonList::
 	jp TextScriptEnd
 
 BillsHousePokemonListText1:
-	TX_FAR _BillsHousePokemonListText1
+	text_far _BillsHousePokemonListText1
-	db "@"
+	text_end
 
 BillsMonListText:
 	db   "EEVEE"
@@ -130,5 +130,5 @@ BillsMonListText:
 	next "CANCEL@"
 
 BillsHousePokemonListText2:
-	TX_FAR _BillsHousePokemonListText2
+	text_far _BillsHousePokemonListText2
-	db "@"
+	text_end

engine/events/hidden_objects/blues_room.asm

@@ -9,5 +9,5 @@ PrintBookcaseText:
 	tx_pre_jump BookcaseText
 
 BookcaseText::
-	TX_FAR _BookcaseText
+	text_far _BookcaseText
-	db "@"
+	text_end

engine/events/hidden_objects/book_or_sculpture.asm

@@ -1,5 +1,5 @@
 BookOrSculptureText::
-	TX_ASM
+	text_asm
 	ld hl, PokemonBooksText
 	ld a, [wCurMapTileset]
 	cp MANSION ; Celadon Mansion tileset
@@ -13,9 +13,9 @@ BookOrSculptureText::
 	jp TextScriptEnd
 
 PokemonBooksText:
-	TX_FAR _PokemonBooksText
+	text_far _PokemonBooksText
-	db "@"
+	text_end
 
 DiglettSculptureText:
-	TX_FAR _DiglettSculptureText
+	text_far _DiglettSculptureText
-	db "@"
+	text_end

engine/events/hidden_objects/cinnabar_gym_quiz.asm

@@ -6,7 +6,7 @@ PrintCinnabarQuiz:
 	tx_pre_jump CinnabarGymQuiz
 
 CinnabarGymQuiz::
-	TX_ASM
+	text_asm
 	xor a
 	ld [wOpponentAfterWrongAnswer], a
 	ld a, [wHiddenObjectFunctionArgument]
@@ -36,8 +36,8 @@ CinnabarGymQuiz::
 	jp TextScriptEnd
 
 CinnabarGymQuizIntroText:
-	TX_FAR _CinnabarGymQuizIntroText
+	text_far _CinnabarGymQuizIntroText
-	db "@"
+	text_end
 
 CinnabarQuizQuestions:
 	dw CinnabarQuizQuestionsText1
@@ -48,28 +48,28 @@ CinnabarQuizQuestions:
 	dw CinnabarQuizQuestionsText6
 
 CinnabarQuizQuestionsText1:
-	TX_FAR _CinnabarQuizQuestionsText1
+	text_far _CinnabarQuizQuestionsText1
-	db "@"
+	text_end
 
 CinnabarQuizQuestionsText2:
-	TX_FAR _CinnabarQuizQuestionsText2
+	text_far _CinnabarQuizQuestionsText2
-	db "@"
+	text_end
 
 CinnabarQuizQuestionsText3:
-	TX_FAR _CinnabarQuizQuestionsText3
+	text_far _CinnabarQuizQuestionsText3
-	db "@"
+	text_end
 
 CinnabarQuizQuestionsText4:
-	TX_FAR _CinnabarQuizQuestionsText4
+	text_far _CinnabarQuizQuestionsText4
-	db "@"
+	text_end
 
 CinnabarQuizQuestionsText5:
-	TX_FAR _CinnabarQuizQuestionsText5
+	text_far _CinnabarQuizQuestionsText5
-	db "@"
+	text_end
 
 CinnabarQuizQuestionsText6:
-	TX_FAR _CinnabarQuizQuestionsText6
+	text_far _CinnabarQuizQuestionsText6
-	db "@"
+	text_end
 
 CinnabarGymGateFlagAction:
 	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
@@ -117,10 +117,10 @@ CinnabarGymQuiz_1ea92:
 	ret
 
 CinnabarGymQuizCorrectText:
-	TX_SFX_ITEM_1
+	sound_get_item_1
-	TX_FAR _CinnabarGymQuizCorrectText
+	text_far _CinnabarGymQuizCorrectText
-	TX_BLINK
+	text_promptbutton
-	TX_ASM
+	text_asm
 
 	ld a, [hBackupGymGateIndex]
 	AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0
@@ -137,8 +137,8 @@ CinnabarGymQuizCorrectText:
 	jp TextScriptEnd
 
 CinnabarGymQuizIncorrectText:
-	TX_FAR _CinnabarGymQuizIncorrectText
+	text_far _CinnabarGymQuizIncorrectText
-	db "@"
+	text_end
 
 UpdateCinnabarGymGateTileBlocks_::
 ; Update the overworld map with open floor blocks or locked gate blocks

engine/events/hidden_objects/elevator.asm

@@ -1,3 +1,3 @@
 ElevatorText::
-	TX_FAR _ElevatorText
+	text_far _ElevatorText
-	db "@"
+	text_end

engine/events/hidden_objects/fighting_dojo.asm

@@ -3,21 +3,21 @@ PrintFightingDojoText2:
 	tx_pre_jump EnemiesOnEverySideText
 
 EnemiesOnEverySideText::
-	TX_FAR _EnemiesOnEverySideText
+	text_far _EnemiesOnEverySideText
-	db "@"
+	text_end
 
 PrintFightingDojoText3:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump WhatGoesAroundComesAroundText
 
 WhatGoesAroundComesAroundText::
-	TX_FAR _WhatGoesAroundComesAroundText
+	text_far _WhatGoesAroundComesAroundText
-	db "@"
+	text_end
 
 PrintFightingDojoText:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump FightingDojoText
 
 FightingDojoText::
-	TX_FAR _FightingDojoText
+	text_far _FightingDojoText
-	db "@"
+	text_end

engine/events/hidden_objects/gym_statues.asm

@@ -40,9 +40,9 @@ GymStatues:
 	db $ff
 
 GymStatueText1::
-	TX_FAR _GymStatueText1
+	text_far _GymStatueText1
-	db "@"
+	text_end
 
 GymStatueText2::
-	TX_FAR _GymStatueText2
+	text_far _GymStatueText2
-	db "@"
+	text_end

engine/events/hidden_objects/indigo_plateau_hq.asm

@@ -6,5 +6,5 @@ PrintIndigoPlateauHQText:
 	tx_pre_jump IndigoPlateauHQText
 
 IndigoPlateauHQText::
-	TX_FAR _IndigoPlateauHQText
+	text_far _IndigoPlateauHQText
-	db "@"
+	text_end

engine/events/hidden_objects/indigo_plateau_statues.asm

@@ -1,5 +1,5 @@
 IndigoPlateauStatues::
-	TX_ASM
+	text_asm
 	ld hl, IndigoPlateauStatuesText1
 	call PrintText
 	ld a, [wXCoord]
@@ -12,13 +12,13 @@ IndigoPlateauStatues::
 	jp TextScriptEnd
 
 IndigoPlateauStatuesText1:
-	TX_FAR _IndigoPlateauStatuesText1
+	text_far _IndigoPlateauStatuesText1
-	db "@"
+	text_end
 
 IndigoPlateauStatuesText2:
-	TX_FAR _IndigoPlateauStatuesText2
+	text_far _IndigoPlateauStatuesText2
-	db "@"
+	text_end
 
 IndigoPlateauStatuesText3:
-	TX_FAR _IndigoPlateauStatuesText3
+	text_far _IndigoPlateauStatuesText3
-	db "@"
+	text_end

engine/events/hidden_objects/magazines.asm

@@ -4,5 +4,5 @@ PrintMagazinesText:
 	ret
 
 MagazinesText::
-	TX_FAR _MagazinesText
+	text_far _MagazinesText
-	db "@"
+	text_end

engine/events/hidden_objects/museum_fossils.asm

@@ -7,8 +7,8 @@ AerodactylFossil:
 	ret
 
 AerodactylFossilText::
-	TX_FAR _AerodactylFossilText
+	text_far _AerodactylFossilText
-	db "@"
+	text_end
 
 KabutopsFossil:
 	ld a, FOSSIL_KABUTOPS
@@ -19,8 +19,8 @@ KabutopsFossil:
 	ret
 
 KabutopsFossilText::
-	TX_FAR _KabutopsFossilText
+	text_far _KabutopsFossilText
-	db "@"
+	text_end
 
 DisplayMonFrontSpriteInBox:
 ; Displays a pokemon's front sprite in a pop-up window.

engine/events/hidden_objects/new_bike.asm

@@ -3,5 +3,5 @@ PrintNewBikeText:
 	tx_pre_jump NewBicycleText
 
 NewBicycleText::
-	TX_FAR _NewBicycleText
+	text_far _NewBicycleText
-	db "@"
+	text_end

engine/events/hidden_objects/oaks_lab_email.asm

@@ -6,5 +6,5 @@ DisplayOakLabEmailText:
 	tx_pre_jump OakLabEmailText
 
 OakLabEmailText::
-	TX_FAR _OakLabEmailText
+	text_far _OakLabEmailText
-	db "@"
+	text_end

engine/events/hidden_objects/oaks_lab_posters.asm

@@ -3,8 +3,8 @@ DisplayOakLabLeftPoster:
 	tx_pre_jump PushStartText
 
 PushStartText::
-	TX_FAR _PushStartText
+	text_far _PushStartText
-	db "@"
+	text_end
 
 DisplayOakLabRightPoster:
 	call EnableAutoTextBoxDrawing
@@ -21,9 +21,9 @@ DisplayOakLabRightPoster:
 	jp PrintPredefTextID
 
 SaveOptionText::
-	TX_FAR _SaveOptionText
+	text_far _SaveOptionText
-	db "@"
+	text_end
 
 StrengthsAndWeaknessesText::
-	TX_FAR _StrengthsAndWeaknessesText
+	text_far _StrengthsAndWeaknessesText
-	db "@"
+	text_end

engine/events/hidden_objects/pokecenter_pc.asm

@@ -8,4 +8,4 @@ OpenPokemonCenterPC:
 	tx_pre_jump PokemonCenterPCText
 
 PokemonCenterPCText::
-	TX_POKECENTER_PC
+	script_pokecenter_pc

engine/events/hidden_objects/pokemon_stuff.asm

@@ -1,3 +1,3 @@
 PokemonStuffText::
-	TX_FAR _PokemonStuffText
+	text_far _PokemonStuffText
-	db "@"
+	text_end

engine/events/hidden_objects/reds_room.asm

@@ -3,12 +3,12 @@ PrintRedSNESText:
 	tx_pre_jump RedBedroomSNESText
 
 RedBedroomSNESText::
-	TX_FAR _RedBedroomSNESText
+	text_far _RedBedroomSNESText
-	db "@"
+	text_end
 
 OpenRedsPC:
 	call EnableAutoTextBoxDrawing
 	tx_pre_jump RedBedroomPCText
 
 RedBedroomPCText::
-	TX_PLAYERS_PC
+	script_players_pc

engine/events/hidden_objects/route_15_binoculars.asm

@@ -10,5 +10,5 @@ Route15GateLeftBinoculars:
 	jp DisplayMonFrontSpriteInBox
 
 Route15UpstairsBinocularsText::
-	TX_FAR _Route15UpstairsBinocularsText
+	text_far _Route15UpstairsBinocularsText
-	db "@"
+	text_end

engine/events/hidden_objects/safari_game.asm

@@ -59,7 +59,7 @@ PrintSafariGameOverText::
 	jp PrintText
 
 SafariGameOverText:
-	TX_ASM
+	text_asm
 	ld a, [wNumSafariBalls]
 	and a
 	jr z, .noMoreSafariBalls
@@ -71,9 +71,9 @@ SafariGameOverText:
 	jp TextScriptEnd
 
 TimesUpText:
-	TX_FAR _TimesUpText
+	text_far _TimesUpText
-	db "@"
+	text_end
 
 GameOverText:
-	TX_FAR _GameOverText
+	text_far _GameOverText
-	db "@"
+	text_end

engine/events/hidden_objects/school_blackboard.asm

@@ -7,7 +7,7 @@ PrintBlackboardLinkCableText:
 	ret
 
 LinkCableHelp::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, LinkCableHelpText1
 	call PrintText
@@ -60,12 +60,12 @@ LinkCableHelp::
 	jp TextScriptEnd
 
 LinkCableHelpText1:
-	TX_FAR _LinkCableHelpText1
+	text_far _LinkCableHelpText1
-	db "@"
+	text_end
 
 LinkCableHelpText2:
-	TX_FAR _LinkCableHelpText2
+	text_far _LinkCableHelpText2
-	db "@"
+	text_end
 
 HowToLinkText:
 	db   "HOW TO LINK"
@@ -79,19 +79,19 @@ LinkCableInfoTexts:
 	dw LinkCableInfoText3
 
 LinkCableInfoText1:
-	TX_FAR _LinkCableInfoText1
+	text_far _LinkCableInfoText1
-	db "@"
+	text_end
 
 LinkCableInfoText2:
-	TX_FAR _LinkCableInfoText2
+	text_far _LinkCableInfoText2
-	db "@"
+	text_end
 
 LinkCableInfoText3:
-	TX_FAR _LinkCableInfoText3
+	text_far _LinkCableInfoText3
-	db "@"
+	text_end
 
 ViridianSchoolBlackboard::
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, ViridianSchoolBlackboardText1
 	call PrintText
@@ -177,12 +177,12 @@ ViridianSchoolBlackboard::
 	jp TextScriptEnd
 
 ViridianSchoolBlackboardText1:
-	TX_FAR _ViridianSchoolBlackboardText1
+	text_far _ViridianSchoolBlackboardText1
-	db "@"
+	text_end
 
 ViridianSchoolBlackboardText2:
-	TX_FAR _ViridianSchoolBlackboardText2
+	text_far _ViridianSchoolBlackboardText2
-	db "@"
+	text_end
 
 StatusAilmentText1:
 	db   " SLP"
@@ -192,7 +192,9 @@ StatusAilmentText1:
 StatusAilmentText2:
 	db   " BRN"
 	next " FRZ"
-	next " QUIT@@"
+	next " QUIT@"
+
+	db "@" ; unused
 
 ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardSleepText
@@ -202,21 +204,21 @@ ViridianBlackboardStatusPointers:
 	dw ViridianBlackboardFrozenText
 
 ViridianBlackboardSleepText:
-	TX_FAR _ViridianBlackboardSleepText
+	text_far _ViridianBlackboardSleepText
-	db "@"
+	text_end
 
 ViridianBlackboardPoisonText:
-	TX_FAR _ViridianBlackboardPoisonText
+	text_far _ViridianBlackboardPoisonText
-	db "@"
+	text_end
 
 ViridianBlackboardPrlzText:
-	TX_FAR _ViridianBlackboardPrlzText
+	text_far _ViridianBlackboardPrlzText
-	db "@"
+	text_end
 
 ViridianBlackboardBurnText:
-	TX_FAR _ViridianBlackboardBurnText
+	text_far _ViridianBlackboardBurnText
-	db "@"
+	text_end
 
 ViridianBlackboardFrozenText:
-	TX_FAR _ViridianBlackboardFrozenText
+	text_far _ViridianBlackboardFrozenText
-	db "@"
+	text_end

engine/events/hidden_objects/school_notebooks.asm

@@ -6,12 +6,12 @@ PrintNotebookText:
 	jp PrintPredefTextID
 
 TMNotebook::
-	TX_FAR TMNotebookText
+	text_far TMNotebookText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 ViridianSchoolNotebook::
-	TX_ASM
+	text_asm
 	ld hl, ViridianSchoolNotebookText1
 	call PrintText
 	call TurnPageSchoolNotebook
@@ -40,26 +40,26 @@ TurnPageSchoolNotebook:
 	ret
 
 TurnPageText:
-	TX_FAR _TurnPageText
+	text_far _TurnPageText
-	db "@"
+	text_end
 
 ViridianSchoolNotebookText5:
-	TX_FAR _ViridianSchoolNotebookText5
+	text_far _ViridianSchoolNotebookText5
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 ViridianSchoolNotebookText1:
-	TX_FAR _ViridianSchoolNotebookText1
+	text_far _ViridianSchoolNotebookText1
-	db "@"
+	text_end
 
 ViridianSchoolNotebookText2:
-	TX_FAR _ViridianSchoolNotebookText2
+	text_far _ViridianSchoolNotebookText2
-	db "@"
+	text_end
 
 ViridianSchoolNotebookText3:
-	TX_FAR _ViridianSchoolNotebookText3
+	text_far _ViridianSchoolNotebookText3
-	db "@"
+	text_end
 
 ViridianSchoolNotebookText4:
-	TX_FAR _ViridianSchoolNotebookText4
+	text_far _ViridianSchoolNotebookText4
-	db "@"
+	text_end

engine/events/hidden_objects/town_map.asm

@@ -1,7 +1,7 @@
 TownMapText::
-	TX_FAR _TownMapText
+	text_far _TownMapText
-	TX_BLINK
+	text_promptbutton
-	TX_ASM
+	text_asm
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd730

engine/events/hidden_objects/vermilion_gym_trash.asm

@@ -3,8 +3,8 @@ PrintTrashText:
 	tx_pre_jump VermilionGymTrashText
 
 VermilionGymTrashText::
-	TX_FAR _VermilionGymTrashText
+	text_far _VermilionGymTrashText
-	db "@"
+	text_end
 
 GymTrashScript:
 	call EnableAutoTextBoxDrawing
@@ -128,8 +128,8 @@ GymTrashCans:
 	db 2, 11, 13,  0,  0 ; 14
 
 VermilionGymTrashSuccessText1::
-	TX_FAR _VermilionGymTrashSuccessText1
+	text_far _VermilionGymTrashSuccessText1
-	TX_ASM
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_SWITCH
 	call PlaySound
@@ -138,12 +138,12 @@ VermilionGymTrashSuccessText1::
 
 ; unused
 VermilionGymTrashSuccessText2::
-	TX_FAR _VermilionGymTrashSuccessText2
+	text_far _VermilionGymTrashSuccessText2
-	db "@"
+	text_end
 
 ; unused
 VermilionGymTrashSuccesPlaySfx:
-	TX_ASM
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_SWITCH
 	call PlaySound
@@ -151,8 +151,8 @@ VermilionGymTrashSuccesPlaySfx:
 	jp TextScriptEnd
 
 VermilionGymTrashSuccessText3::
-	TX_FAR _VermilionGymTrashSuccessText3
+	text_far _VermilionGymTrashSuccessText3
-	TX_ASM
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_GO_INSIDE
 	call PlaySound
@@ -160,8 +160,8 @@ VermilionGymTrashSuccessText3::
 	jp TextScriptEnd
 
 VermilionGymTrashFailText::
-	TX_FAR _VermilionGymTrashFailText
+	text_far _VermilionGymTrashFailText
-	TX_ASM
+	text_asm
 	call WaitForSoundToFinish
 	ld a, SFX_DENIED
 	call PlaySound

engine/events/in_game_trades.asm

@@ -230,8 +230,7 @@ InGameTrade_GetReceivedMonPointer:
 	ret
 
 InGameTrade_TrainerString:
-	; "TRAINER@@@@@@@@@@"
+	db "<TRAINER>@@@@@@@@@@"
-	db $5d, "@@@@@@@@@@"
 
 InGameTradeTextPointers:
 	dw TradeTextPointers1
@@ -260,71 +259,71 @@ TradeTextPointers3:
 	dw AfterTrade3Text
 
 ConnectCableText:
-	TX_FAR _ConnectCableText
+	text_far _ConnectCableText
-	db "@"
+	text_end
 
 TradedForText:
-	TX_FAR _TradedForText
+	text_far _TradedForText
-	TX_SFX_KEY_ITEM
+	sound_get_key_item
-	TX_DELAY
+	text_pause
-	db "@"
+	text_end
 
 WannaTrade1Text:
-	TX_FAR _WannaTrade1Text
+	text_far _WannaTrade1Text
-	db "@"
+	text_end
 
 NoTrade1Text:
-	TX_FAR _NoTrade1Text
+	text_far _NoTrade1Text
-	db "@"
+	text_end
 
 WrongMon1Text:
-	TX_FAR _WrongMon1Text
+	text_far _WrongMon1Text
-	db "@"
+	text_end
 
 Thanks1Text:
-	TX_FAR _Thanks1Text
+	text_far _Thanks1Text
-	db "@"
+	text_end
 
 AfterTrade1Text:
-	TX_FAR _AfterTrade1Text
+	text_far _AfterTrade1Text
-	db "@"
+	text_end
 
 WannaTrade2Text:
-	TX_FAR _WannaTrade2Text
+	text_far _WannaTrade2Text
-	db "@"
+	text_end
 
 NoTrade2Text:
-	TX_FAR _NoTrade2Text
+	text_far _NoTrade2Text
-	db "@"
+	text_end
 
 WrongMon2Text:
-	TX_FAR _WrongMon2Text
+	text_far _WrongMon2Text
-	db "@"
+	text_end
 
 Thanks2Text:
-	TX_FAR _Thanks2Text
+	text_far _Thanks2Text
-	db "@"
+	text_end
 
 AfterTrade2Text:
-	TX_FAR _AfterTrade2Text
+	text_far _AfterTrade2Text
-	db "@"
+	text_end
 
 WannaTrade3Text:
-	TX_FAR _WannaTrade3Text
+	text_far _WannaTrade3Text
-	db "@"
+	text_end
 
 NoTrade3Text:
-	TX_FAR _NoTrade3Text
+	text_far _NoTrade3Text
-	db "@"
+	text_end
 
 WrongMon3Text:
-	TX_FAR _WrongMon3Text
+	text_far _WrongMon3Text
-	db "@"
+	text_end
 
 Thanks3Text:
-	TX_FAR _Thanks3Text
+	text_far _Thanks3Text
-	db "@"
+	text_end
 
 AfterTrade3Text:
-	TX_FAR _AfterTrade3Text
+	text_far _AfterTrade3Text
-	db "@"
+	text_end

engine/events/oaks_aide.asm

@@ -46,26 +46,26 @@ OaksAideScript:
 	ret
 
 OaksAideHiText:
-	TX_FAR _OaksAideHiText
+	text_far _OaksAideHiText
-	db "@"
+	text_end
 
 OaksAideUhOhText:
-	TX_FAR _OaksAideUhOhText
+	text_far _OaksAideUhOhText
-	db "@"
+	text_end
 
 OaksAideComeBackText:
-	TX_FAR _OaksAideComeBackText
+	text_far _OaksAideComeBackText
-	db "@"
+	text_end
 
 OaksAideHereYouGoText:
-	TX_FAR _OaksAideHereYouGoText
+	text_far _OaksAideHereYouGoText
-	db "@"
+	text_end
 
 OaksAideGotItemText:
-	TX_FAR _OaksAideGotItemText
+	text_far _OaksAideGotItemText
-	TX_SFX_ITEM_1
+	sound_get_item_1
-	db "@"
+	text_end
 
 OaksAideNoRoomText:
-	TX_FAR _OaksAideNoRoomText
+	text_far _OaksAideNoRoomText
-	db "@"
+	text_end

engine/events/pick_up_item.asm

@@ -45,10 +45,10 @@ PickUpItem:
 	ret
 
 FoundItemText:
-	TX_FAR _FoundItemText
+	text_far _FoundItemText
-	TX_SFX_ITEM_1
+	sound_get_item_1
-	db "@"
+	text_end
 
 NoMoreRoomForItemText:
-	TX_FAR _NoMoreRoomForItemText
+	text_far _NoMoreRoomForItemText
-	db "@"
+	text_end

engine/events/pokecenter.asm

@@ -46,23 +46,23 @@ DisplayPokemonCenterDialogue_::
 	jp UpdateSprites
 
 PokemonCenterWelcomeText:
-	TX_FAR _PokemonCenterWelcomeText
+	text_far _PokemonCenterWelcomeText
-	db "@"
+	text_end
 
 ShallWeHealYourPokemonText:
-	TX_DELAY
+	text_pause
-	TX_FAR _ShallWeHealYourPokemonText
+	text_far _ShallWeHealYourPokemonText
-	db "@"
+	text_end
 
 NeedYourPokemonText:
-	TX_FAR _NeedYourPokemonText
+	text_far _NeedYourPokemonText
-	db "@"
+	text_end
 
 PokemonFightingFitText:
-	TX_FAR _PokemonFightingFitText
+	text_far _PokemonFightingFitText
-	db "@"
+	text_end
 
 PokemonCenterFarewellText:
-	TX_DELAY
+	text_pause
-	TX_FAR _PokemonCenterFarewellText
+	text_far _PokemonCenterFarewellText
-	db "@"
+	text_end

engine/events/pokedex_rating.asm

@@ -52,8 +52,8 @@ DisplayDexRating:
 	ret
 
 PokedexRatingText_441cc:
-	TX_FAR _OaksLabText_441cc
+	text_far _OaksLabText_441cc
-	db "@"
+	text_end
 
 DexRatingsTable:
 	db 10
@@ -90,65 +90,65 @@ DexRatingsTable:
 	dw PokedexRatingText_4424c
 
 PokedexRatingText_44201:
-	TX_FAR _OaksLabText_44201
+	text_far _OaksLabText_44201
-	db "@"
+	text_end
 
 PokedexRatingText_44206:
-	TX_FAR _OaksLabText_44206
+	text_far _OaksLabText_44206
-	db "@"
+	text_end
 
 PokedexRatingText_4420b:
-	TX_FAR _OaksLabText_4420b
+	text_far _OaksLabText_4420b
-	db "@"
+	text_end
 
 PokedexRatingText_44210:
-	TX_FAR _OaksLabText_44210
+	text_far _OaksLabText_44210
-	db "@"
+	text_end
 
 PokedexRatingText_44215:
-	TX_FAR _OaksLabText_44215
+	text_far _OaksLabText_44215
-	db "@"
+	text_end
 
 PokedexRatingText_4421a:
-	TX_FAR _OaksLabText_4421a
+	text_far _OaksLabText_4421a
-	db "@"
+	text_end
 
 PokedexRatingText_4421f:
-	TX_FAR _OaksLabText_4421f
+	text_far _OaksLabText_4421f
-	db "@"
+	text_end
 
 PokedexRatingText_44224:
-	TX_FAR _OaksLabText_44224
+	text_far _OaksLabText_44224
-	db "@"
+	text_end
 
 PokedexRatingText_44229:
-	TX_FAR _OaksLabText_44229
+	text_far _OaksLabText_44229
-	db "@"
+	text_end
 
 PokedexRatingText_4422e:
-	TX_FAR _OaksLabText_4422e
+	text_far _OaksLabText_4422e
-	db "@"
+	text_end
 
 PokedexRatingText_44233:
-	TX_FAR _OaksLabText_44233
+	text_far _OaksLabText_44233
-	db "@"
+	text_end
 
 PokedexRatingText_44238:
-	TX_FAR _OaksLabText_44238
+	text_far _OaksLabText_44238
-	db "@"
+	text_end
 
 PokedexRatingText_4423d:
-	TX_FAR _OaksLabText_4423d
+	text_far _OaksLabText_4423d
-	db "@"
+	text_end
 
 PokedexRatingText_44242:
-	TX_FAR _OaksLabText_44242
+	text_far _OaksLabText_44242
-	db "@"
+	text_end
 
 PokedexRatingText_44247:
-	TX_FAR _OaksLabText_44247
+	text_far _OaksLabText_44247
-	db "@"
+	text_end
 
 PokedexRatingText_4424c:
-	TX_FAR _OaksLabText_4424c
+	text_far _OaksLabText_4424c
-	db "@"
+	text_end

engine/events/pokemart.asm

@@ -228,45 +228,45 @@ DisplayPokemartDialogue_::
 	ret
 
 PokemartBuyingGreetingText:
-	TX_FAR _PokemartBuyingGreetingText
+	text_far _PokemartBuyingGreetingText
-	db "@"
+	text_end
 
 PokemartTellBuyPriceText:
-	TX_FAR _PokemartTellBuyPriceText
+	text_far _PokemartTellBuyPriceText
-	db "@"
+	text_end
 
 PokemartBoughtItemText:
-	TX_FAR _PokemartBoughtItemText
+	text_far _PokemartBoughtItemText
-	db "@"
+	text_end
 
 PokemartNotEnoughMoneyText:
-	TX_FAR _PokemartNotEnoughMoneyText
+	text_far _PokemartNotEnoughMoneyText
-	db "@"
+	text_end
 
 PokemartItemBagFullText:
-	TX_FAR _PokemartItemBagFullText
+	text_far _PokemartItemBagFullText
-	db "@"
+	text_end
 
 PokemonSellingGreetingText:
-	TX_FAR _PokemonSellingGreetingText
+	text_far _PokemonSellingGreetingText
-	db "@"
+	text_end
 
 PokemartTellSellPriceText:
-	TX_FAR _PokemartTellSellPriceText
+	text_far _PokemartTellSellPriceText
-	db "@"
+	text_end
 
 PokemartItemBagEmptyText:
-	TX_FAR _PokemartItemBagEmptyText
+	text_far _PokemartItemBagEmptyText
-	db "@"
+	text_end
 
 PokemartUnsellableItemText:
-	TX_FAR _PokemartUnsellableItemText
+	text_far _PokemartUnsellableItemText
-	db "@"
+	text_end
 
 PokemartThankYouText:
-	TX_FAR _PokemartThankYouText
+	text_far _PokemartThankYouText
-	db "@"
+	text_end
 
 PokemartAnythingElseText:
-	TX_FAR _PokemartAnythingElseText
+	text_far _PokemartAnythingElseText
-	db "@"
+	text_end

engine/events/prize_menu.asm

@@ -43,17 +43,17 @@ CeladonPrizeMenu::
 	ret
 
 RequireCoinCaseTextPtr:
-	TX_FAR _RequireCoinCaseText
+	text_far _RequireCoinCaseText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 ExchangeCoinsForPrizesTextPtr:
-	TX_FAR _ExchangeCoinsForPrizesText
+	text_far _ExchangeCoinsForPrizesText
-	db "@"
+	text_end
 
 WhichPrizeTextPtr:
-	TX_FAR _WhichPrizeText
+	text_far _WhichPrizeText
-	db "@"
+	text_end
 
 GetPrizeMenuId:
 ; determine which one among the three
@@ -263,28 +263,28 @@ UnknownPrizeData:
 	db $00,$01,$00,$01,$00,$01,$00,$00,$01
 
 HereYouGoTextPtr:
-	TX_FAR _HereYouGoText
+	text_far _HereYouGoText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 SoYouWantPrizeTextPtr:
-	TX_FAR _SoYouWantPrizeText
+	text_far _SoYouWantPrizeText
-	db "@"
+	text_end
 
 SorryNeedMoreCoinsText:
-	TX_FAR _SorryNeedMoreCoinsText
+	text_far _SorryNeedMoreCoinsText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 PrizeRoomBagIsFullTextPtr:
-	TX_FAR _OopsYouDontHaveEnoughRoomText
+	text_far _OopsYouDontHaveEnoughRoomText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 OhFineThenTextPtr:
-	TX_FAR _OhFineThenText
+	text_far _OhFineThenText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 GetPrizeMonLevel:
 	ld a, [wcf91]

engine/events/vending_machine.asm

@@ -81,8 +81,8 @@ VendingMachineMenu::
 	jp PrintText
 
 VendingMachineText1:
-	TX_FAR _VendingMachineText1
+	text_far _VendingMachineText1
-	db "@"
+	text_end
 
 DrinkText:
 	db   "FRESH WATER"
@@ -97,20 +97,20 @@ DrinkPriceText:
 	next "@"
 
 VendingMachineText4:
-	TX_FAR _VendingMachineText4
+	text_far _VendingMachineText4
-	db "@"
+	text_end
 
 VendingMachineText5:
-	TX_FAR _VendingMachineText5
+	text_far _VendingMachineText5
-	db "@"
+	text_end
 
 VendingMachineText6:
-	TX_FAR _VendingMachineText6
+	text_far _VendingMachineText6
-	db "@"
+	text_end
 
 VendingMachineText7:
-	TX_FAR _VendingMachineText7
+	text_far _VendingMachineText7
-	db "@"
+	text_end
 
 LoadVendingMachineItem:
 	ld hl, VendingPrices

engine/items/item_effects.asm

@@ -586,47 +586,47 @@ ItemUseBall:
 ItemUseBallText00:
 ;"It dodged the thrown ball!"
 ;"This pokemon can't be caught"
-	TX_FAR _ItemUseBallText00
+	text_far _ItemUseBallText00
-	db "@"
+	text_end
 ItemUseBallText01:
 ;"You missed the pokemon!"
-	TX_FAR _ItemUseBallText01
+	text_far _ItemUseBallText01
-	db "@"
+	text_end
 ItemUseBallText02:
 ;"Darn! The pokemon broke free!"
-	TX_FAR _ItemUseBallText02
+	text_far _ItemUseBallText02
-	db "@"
+	text_end
 ItemUseBallText03:
 ;"Aww! It appeared to be caught!"
-	TX_FAR _ItemUseBallText03
+	text_far _ItemUseBallText03
-	db "@"
+	text_end
 ItemUseBallText04:
 ;"Shoot! It was so close too!"
-	TX_FAR _ItemUseBallText04
+	text_far _ItemUseBallText04
-	db "@"
+	text_end
 ItemUseBallText05:
 ;"All right! {MonName} was caught!"
 ;play sound
-	TX_FAR _ItemUseBallText05
+	text_far _ItemUseBallText05
-	TX_SFX_CAUGHT_MON
+	sound_caught_mon
-	TX_BLINK
+	text_promptbutton
-	db "@"
+	text_end
 ItemUseBallText07:
 ;"X was transferred to Bill's PC"
-	TX_FAR _ItemUseBallText07
+	text_far _ItemUseBallText07
-	db "@"
+	text_end
 ItemUseBallText08:
 ;"X was transferred to someone's PC"
-	TX_FAR _ItemUseBallText08
+	text_far _ItemUseBallText08
-	db "@"
+	text_end
 
 ItemUseBallText06:
 ;"New DEX data will be added..."
 ;play sound
-	TX_FAR _ItemUseBallText06
+	text_far _ItemUseBallText06
-	TX_SFX_DEX_PAGE_ADDED
+	sound_dex_page_added
-	TX_BLINK
+	text_promptbutton
-	db "@"
+	text_end
 
 ItemUseTownMap:
 	ld a, [wIsInBattle]
@@ -745,12 +745,12 @@ ItemUseSurfboard:
 	ret
 
 SurfingGotOnText:
-	TX_FAR _SurfingGotOnText
+	text_far _SurfingGotOnText
-	db "@"
+	text_end
 
 SurfingNoPlaceToGetOffText:
-	TX_FAR _SurfingNoPlaceToGetOffText
+	text_far _SurfingNoPlaceToGetOffText
-	db "@"
+	text_end
 
 ItemUsePokedex:
 	predef_jump ShowPokedexMenu
@@ -1417,12 +1417,12 @@ ItemUseMedicine:
 	jp RemoveUsedItem
 
 VitaminStatRoseText:
-	TX_FAR _VitaminStatRoseText
+	text_far _VitaminStatRoseText
-	db "@"
+	text_end
 
 VitaminNoEffectText:
-	TX_FAR _VitaminNoEffectText
+	text_far _VitaminNoEffectText
-	db "@"
+	text_end
 
 VitaminText:
 	db "HEALTH@"
@@ -1479,12 +1479,12 @@ BaitRockCommon:
 	jp DelayFrames
 
 ThrewBaitText:
-	TX_FAR _ThrewBaitText
+	text_far _ThrewBaitText
-	db "@"
+	text_end
 
 ThrewRockText:
-	TX_FAR _ThrewRockText
+	text_far _ThrewRockText
-	db "@"
+	text_end
 
 ; also used for Dig out-of-battle effect
 ItemUseEscapeRope:
@@ -1829,17 +1829,17 @@ Route16SnorlaxFluteCoords:
 	db $ff ; terminator
 
 PlayedFluteNoEffectText:
-	TX_FAR _PlayedFluteNoEffectText
+	text_far _PlayedFluteNoEffectText
-	db "@"
+	text_end
 
 FluteWokeUpText:
-	TX_FAR _FluteWokeUpText
+	text_far _FluteWokeUpText
-	db "@"
+	text_end
 
 PlayedFluteHadEffectText:
-	TX_FAR _PlayedFluteHadEffectText
+	text_far _PlayedFluteHadEffectText
-	TX_BLINK
+	text_promptbutton
-	TX_ASM
+	text_asm
 	ld a, [wIsInBattle]
 	and a
 	jr nz, .done
@@ -1865,8 +1865,8 @@ ItemUseCoinCase:
 	jp PrintText
 
 CoinCaseNumCoinsText:
-	TX_FAR _CoinCaseNumCoinsText
+	text_far _CoinCaseNumCoinsText
-	db "@"
+	text_end
 
 ItemUseOldRod:
 	call FishingInit
@@ -1984,12 +1984,12 @@ ItemUseItemfinder:
 	jp PrintText
 
 ItemfinderFoundItemText:
-	TX_FAR _ItemfinderFoundItemText
+	text_far _ItemfinderFoundItemText
-	db "@"
+	text_end
 
 ItemfinderFoundNothingText:
-	TX_FAR _ItemfinderFoundNothingText
+	text_far _ItemfinderFoundNothingText
-	db "@"
+	text_end
 
 ItemUsePPUp:
 	ld a, [wIsInBattle]
@@ -2173,24 +2173,24 @@ ItemUsePPRestore:
 	ret
 
 RaisePPWhichTechniqueText:
-	TX_FAR _RaisePPWhichTechniqueText
+	text_far _RaisePPWhichTechniqueText
-	db "@"
+	text_end
 
 RestorePPWhichTechniqueText:
-	TX_FAR _RestorePPWhichTechniqueText
+	text_far _RestorePPWhichTechniqueText
-	db "@"
+	text_end
 
 PPMaxedOutText:
-	TX_FAR _PPMaxedOutText
+	text_far _PPMaxedOutText
-	db "@"
+	text_end
 
 PPIncreasedText:
-	TX_FAR _PPIncreasedText
+	text_far _PPIncreasedText
-	db "@"
+	text_end
 
 PPRestoredText:
-	TX_FAR _PPRestoredText
+	text_far _PPRestoredText
-	db "@"
+	text_end
 
 ; for items that can't be used from the Item menu
 UnusableItem:
@@ -2294,20 +2294,20 @@ ItemUseTMHM:
 	jp RemoveUsedItem
 
 BootedUpTMText:
-	TX_FAR _BootedUpTMText
+	text_far _BootedUpTMText
-	db "@"
+	text_end
 
 BootedUpHMText:
-	TX_FAR _BootedUpHMText
+	text_far _BootedUpHMText
-	db "@"
+	text_end
 
 TeachMachineMoveText:
-	TX_FAR _TeachMachineMoveText
+	text_far _TeachMachineMoveText
-	db "@"
+	text_end
 
 MonCannotLearnMachineMoveText:
-	TX_FAR _MonCannotLearnMachineMoveText
+	text_far _MonCannotLearnMachineMoveText
-	db "@"
+	text_end
 
 PrintItemUseTextAndRemoveItem:
 	ld hl, ItemUseText00
@@ -2364,54 +2364,54 @@ ItemUseFailed:
 	jp PrintText
 
 ItemUseNotTimeText:
-	TX_FAR _ItemUseNotTimeText
+	text_far _ItemUseNotTimeText
-	db "@"
+	text_end
 
 ItemUseNotYoursToUseText:
-	TX_FAR _ItemUseNotYoursToUseText
+	text_far _ItemUseNotYoursToUseText
-	db "@"
+	text_end
 
 ItemUseNoEffectText:
-	TX_FAR _ItemUseNoEffectText
+	text_far _ItemUseNoEffectText
-	db "@"
+	text_end
 
 ThrowBallAtTrainerMonText1:
-	TX_FAR _ThrowBallAtTrainerMonText1
+	text_far _ThrowBallAtTrainerMonText1
-	db "@"
+	text_end
 
 ThrowBallAtTrainerMonText2:
-	TX_FAR _ThrowBallAtTrainerMonText2
+	text_far _ThrowBallAtTrainerMonText2
-	db "@"
+	text_end
 
 NoCyclingAllowedHereText:
-	TX_FAR _NoCyclingAllowedHereText
+	text_far _NoCyclingAllowedHereText
-	db "@"
+	text_end
 
 NoSurfingHereText:
-	TX_FAR _NoSurfingHereText
+	text_far _NoSurfingHereText
-	db "@"
+	text_end
 
 BoxFullCannotThrowBallText:
-	TX_FAR _BoxFullCannotThrowBallText
+	text_far _BoxFullCannotThrowBallText
-	db "@"
+	text_end
 
 ItemUseText00:
-	TX_FAR _ItemUseText001
+	text_far _ItemUseText001
-	TX_LINE
+	text_low
-	TX_FAR _ItemUseText002
+	text_far _ItemUseText002
-	db "@"
+	text_end
 
 GotOnBicycleText:
-	TX_FAR _GotOnBicycleText1
+	text_far _GotOnBicycleText1
-	TX_LINE
+	text_low
-	TX_FAR _GotOnBicycleText2
+	text_far _GotOnBicycleText2
-	db "@"
+	text_end
 
 GotOffBicycleText:
-	TX_FAR _GotOffBicycleText1
+	text_far _GotOffBicycleText1
-	TX_LINE
+	text_low
-	TX_FAR _GotOffBicycleText2
+	text_far _GotOffBicycleText2
-	db "@"
+	text_end
 
 ; restores bonus PP (from PP Ups) when healing at a pokemon center
 ; also, when a PP Up is used, it increases the current PP by one PP Up bonus
@@ -2639,16 +2639,16 @@ TossItem_::
 	ret
 
 ThrewAwayItemText:
-	TX_FAR _ThrewAwayItemText
+	text_far _ThrewAwayItemText
-	db "@"
+	text_end
 
 IsItOKToTossItemText:
-	TX_FAR _IsItOKToTossItemText
+	text_far _IsItOKToTossItemText
-	db "@"
+	text_end
 
 TooImportantToTossText:
-	TX_FAR _TooImportantToTossText
+	text_far _TooImportantToTossText
-	db "@"
+	text_end
 
 ; checks if an item is a key item
 ; INPUT:

engine/items/tmhm.asm

@@ -22,5 +22,5 @@ CheckIfMoveIsKnown:
 	ret
 
 AlreadyKnowsText:
-	TX_FAR _AlreadyKnowsText
+	text_far _AlreadyKnowsText
-	db "@"
+	text_end

engine/link/cable_club.asm

@@ -872,8 +872,8 @@ TradeCenter_Trade:
 	jp CallCurrentTradeCenterFunction
 
 WillBeTradedText:
-	TX_FAR _WillBeTradedText
+	text_far _WillBeTradedText
-	db "@"
+	text_end
 
 TradeCompleted:
 	db "Trade completed!@"

engine/link/cable_club_npc.asm

@@ -110,33 +110,33 @@ CableClubNPC::
 	jpab LinkMenu
 
 CableClubNPCAreaReservedFor2FriendsLinkedByCableText:
-	TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText
+	text_far _CableClubNPCAreaReservedFor2FriendsLinkedByCableText
-	db "@"
+	text_end
 
 CableClubNPCWelcomeText:
-	TX_FAR _CableClubNPCWelcomeText
+	text_far _CableClubNPCWelcomeText
-	db "@"
+	text_end
 
 CableClubNPCPleaseApplyHereHaveToSaveText:
-	TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText
+	text_far _CableClubNPCPleaseApplyHereHaveToSaveText
-	db "@"
+	text_end
 
 CableClubNPCPleaseWaitText:
-	TX_FAR _CableClubNPCPleaseWaitText
+	text_far _CableClubNPCPleaseWaitText
-	TX_DELAY
+	text_pause
-	db "@"
+	text_end
 
 CableClubNPCLinkClosedBecauseOfInactivityText:
-	TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText
+	text_far _CableClubNPCLinkClosedBecauseOfInactivityText
-	db "@"
+	text_end
 
 CableClubNPCPleaseComeAgainText:
-	TX_FAR _CableClubNPCPleaseComeAgainText
+	text_far _CableClubNPCPleaseComeAgainText
-	db "@"
+	text_end
 
 CableClubNPCMakingPreparationsText:
-	TX_FAR _CableClubNPCMakingPreparationsText
+	text_far _CableClubNPCMakingPreparationsText
-	db "@"
+	text_end
 
 CloseLinkConnection:
 	call Delay3

engine/menus/league_pc.asm

@@ -116,5 +116,5 @@ HallOfFameNoText:
 	db "HALL OF FAME No   @"
 
 AccessedHoFPCText:
-	TX_FAR _AccessedHoFPCText
+	text_far _AccessedHoFPCText
-	db "@"
+	text_end

engine/menus/main_menu.asm

@@ -136,7 +136,7 @@ LinkMenu:
 	ld [wLetterPrintingDelayFlags], a
 	ld hl, wd72e
 	set 6, [hl]
-	ld hl, TextTerminator_6b20
+	ld hl, LinkMenuEmptyText
 	call PrintText
 	call SaveScreenTilesToBuffer1
 	ld hl, WhereWouldYouLikeText
@@ -293,16 +293,16 @@ LinkMenu:
 	ret
 
 WhereWouldYouLikeText:
-	TX_FAR _WhereWouldYouLikeText
+	text_far _WhereWouldYouLikeText
-	db "@"
+	text_end
 
 PleaseWaitText:
-	TX_FAR _PleaseWaitText
+	text_far _PleaseWaitText
-	db "@"
+	text_end
 
 LinkCanceledText:
-	TX_FAR _LinkCanceledText
+	text_far _LinkCanceledText
-	db "@"
+	text_end
 
 StartNewGame:
 	ld hl, wd732
@@ -329,7 +329,9 @@ SpecialEnterMap::
 	jp EnterMap
 
 ContinueText:
-	db "CONTINUE", $4e
+	db "CONTINUE"
+	next ""
+	; fallthrough
 
 NewGameText:
 	db   "NEW GAME"

engine/menus/naming_screen.asm

@@ -50,8 +50,8 @@ AskName:
 	jp CopyData
 
 DoYouWantToNicknameText:
-	TX_FAR _DoYouWantToNicknameText
+	text_far _DoYouWantToNicknameText
-	db "@"
+	text_end
 
 DisplayNameRaterScreen::
 	ld hl, wBuffer

engine/menus/oaks_pc.asm

@@ -15,14 +15,14 @@ OpenOaksPC:
 	jp LoadScreenTilesFromBuffer2
 
 GetDexRatedText:
-	TX_FAR _GetDexRatedText
+	text_far _GetDexRatedText
-	db "@"
+	text_end
 
 ClosedOaksPCText:
-	TX_FAR _ClosedOaksPCText
+	text_far _ClosedOaksPCText
-	TX_WAIT
+	text_linkpromptbutton
-	db "@"
+	text_end
 
 AccessedOaksPCText:
-	TX_FAR _AccessedOaksPCText
+	text_far _AccessedOaksPCText
-	db "@"
+	text_end

engine/menus/party_menu.asm

@@ -254,62 +254,62 @@ PartyMenuMessagePointers:
 	dw PartyMenuItemUseText
 
 PartyMenuNormalText:
-	TX_FAR _PartyMenuNormalText
+	text_far _PartyMenuNormalText
-	db "@"
+	text_end
 
 PartyMenuItemUseText:
-	TX_FAR _PartyMenuItemUseText
+	text_far _PartyMenuItemUseText
-	db "@"
+	text_end
 
 PartyMenuBattleText:
-	TX_FAR _PartyMenuBattleText
+	text_far _PartyMenuBattleText
-	db "@"
+	text_end
 
 PartyMenuUseTMText:
-	TX_FAR _PartyMenuUseTMText
+	text_far _PartyMenuUseTMText
-	db "@"
+	text_end
 
 PartyMenuSwapMonText:
-	TX_FAR _PartyMenuSwapMonText
+	text_far _PartyMenuSwapMonText
-	db "@"
+	text_end
 
 PotionText:
-	TX_FAR _PotionText
+	text_far _PotionText
-	db "@"
+	text_end
 
 AntidoteText:
-	TX_FAR _AntidoteText
+	text_far _AntidoteText
-	db "@"
+	text_end
 
 ParlyzHealText:
-	TX_FAR _ParlyzHealText
+	text_far _ParlyzHealText
-	db "@"
+	text_end
 
 BurnHealText:
-	TX_FAR _BurnHealText
+	text_far _BurnHealText
-	db "@"
+	text_end
 
 IceHealText:
-	TX_FAR _IceHealText
+	text_far _IceHealText
-	db "@"
+	text_end
 
 AwakeningText:
-	TX_FAR _AwakeningText
+	text_far _AwakeningText
-	db "@"
+	text_end
 
 FullHealText:
-	TX_FAR _FullHealText
+	text_far _FullHealText
-	db "@"
+	text_end
 
 ReviveText:
-	TX_FAR _ReviveText
+	text_far _ReviveText
-	db "@"
+	text_end
 
 RareCandyText:
-	TX_FAR _RareCandyText
+	text_far _RareCandyText
-	TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
+	sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
-	TX_BLINK
+	text_promptbutton
-	db "@"
+	text_end
 
 SetPartyMenuHPBarColor:
 	ld hl, wPartyMenuHPBarColors

engine/menus/pc.asm

@@ -99,20 +99,20 @@ LogOff:
 	ret
 
 TurnedOnPC1Text:
-	TX_FAR _TurnedOnPC1Text
+	text_far _TurnedOnPC1Text
-	db "@"
+	text_end
 
 AccessedBillsPCText:
-	TX_FAR _AccessedBillsPCText
+	text_far _AccessedBillsPCText
-	db "@"
+	text_end
 
 AccessedSomeonesPCText:
-	TX_FAR _AccessedSomeonesPCText
+	text_far _AccessedSomeonesPCText
-	db "@"
+	text_end
 
 AccessedMyPCText:
-	TX_FAR _AccessedMyPCText
+	text_far _AccessedMyPCText
-	db "@"
+	text_end
 
 ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent)
 RemoveItemByID::

engine/menus/players_pc.asm

@@ -247,57 +247,57 @@ PlayersPCMenuEntries:
 	next "LOG OFF@"
 
 TurnedOnPC2Text:
-	TX_FAR _TurnedOnPC2Text
+	text_far _TurnedOnPC2Text
-	db "@"
+	text_end
 
 WhatDoYouWantText:
-	TX_FAR _WhatDoYouWantText
+	text_far _WhatDoYouWantText
-	db "@"
+	text_end
 
 WhatToDepositText:
-	TX_FAR _WhatToDepositText
+	text_far _WhatToDepositText
-	db "@"
+	text_end
 
 DepositHowManyText:
-	TX_FAR _DepositHowManyText
+	text_far _DepositHowManyText
-	db "@"
+	text_end
 
 ItemWasStoredText:
-	TX_FAR _ItemWasStoredText
+	text_far _ItemWasStoredText
-	db "@"
+	text_end
 
 NothingToDepositText:
-	TX_FAR _NothingToDepositText
+	text_far _NothingToDepositText
-	db "@"
+	text_end
 
 NoRoomToStoreText:
-	TX_FAR _NoRoomToStoreText
+	text_far _NoRoomToStoreText
-	db "@"
+	text_end
 
 WhatToWithdrawText:
-	TX_FAR _WhatToWithdrawText
+	text_far _WhatToWithdrawText
-	db "@"
+	text_end
 
 WithdrawHowManyText:
-	TX_FAR _WithdrawHowManyText
+	text_far _WithdrawHowManyText
-	db "@"
+	text_end
 
 WithdrewItemText:
-	TX_FAR _WithdrewItemText
+	text_far _WithdrewItemText
-	db "@"
+	text_end
 
 NothingStoredText:
-	TX_FAR _NothingStoredText
+	text_far _NothingStoredText
-	db "@"
+	text_end
 
 CantCarryMoreText:
-	TX_FAR _CantCarryMoreText
+	text_far _CantCarryMoreText
-	db "@"
+	text_end
 
 WhatToTossText:
-	TX_FAR _WhatToTossText
+	text_far _WhatToTossText
-	db "@"
+	text_end
 
 TossHowManyText:
-	TX_FAR _TossHowManyText
+	text_far _TossHowManyText
-	db "@"
+	text_end

engine/menus/pokedex.asm

@@ -478,7 +478,7 @@ ShowPokedexDataInternal:
 	coord hl, 2, 8
 	ld a, "№"
 	ld [hli], a
-	ld a, "⠄"
+	ld a, "<DOT>"
 	ld [hli], a
 	ld de, wd11e
 	lb bc, LEADING_ZEROES | 1, 3
@@ -518,14 +518,14 @@ ShowPokedexDataInternal:
 	coord hl, 12, 6
 	lb bc, 1, 2
 	call PrintNumber ; print feet (height)
-	ld a, $60 ; feet symbol tile (one tick)
+	ld a, "′"
 	ld [hl], a
 	inc de
 	inc de ; de = address of inches (height)
 	coord hl, 15, 6
 	lb bc, LEADING_ZEROES | 1, 2
 	call PrintNumber ; print inches (height)
-	ld a, $61 ; inches symbol tile (two ticks)
+	ld a, "″"
 	ld [hl], a
 ; now print the weight (note that weight is stored in tenths of pounds internally)
 	inc de
@@ -558,7 +558,7 @@ ShowPokedexDataInternal:
 	inc hl
 	ld a, [hli]
 	ld [hld], a ; make space for the decimal point by moving the last digit forward one tile
-	ld [hl], "⠄" ; decimal point tile
+	ld [hl], "<DOT>" ; decimal point tile
 	pop af
 	ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1]
 	pop af
@@ -590,7 +590,7 @@ ShowPokedexDataInternal:
 	ret
 
 HeightWeightText:
-	db   "HT  ?",$60,"??",$61
+	db   "HT  ?′??″"
 	next "WT   ???lb@"
 
 ; XXX does anything point to this?

engine/menus/save.asm

@@ -28,8 +28,8 @@ LoadSAV:
 	ret
 
 FileDataDestroyedText:
-	TX_FAR _FileDataDestroyedText
+	text_far _FileDataDestroyedText
-	db "@"
+	text_end
 
 LoadSAV0:
 	ld a, SRAM_ENABLE
@@ -184,16 +184,16 @@ SaveSAVConfirm:
 	ret
 
 WouldYouLikeToSaveText:
-	TX_FAR _WouldYouLikeToSaveText
+	text_far _WouldYouLikeToSaveText
-	db "@"
+	text_end
 
 GameSavedText:
-	TX_FAR _GameSavedText
+	text_far _GameSavedText
-	db "@"
+	text_end
 
 OlderFileWillBeErasedText:
-	TX_FAR _OlderFileWillBeErasedText
+	text_far _OlderFileWillBeErasedText
-	db "@"
+	text_end
 
 SaveSAVtoSRAM0:
 	ld a, SRAM_ENABLE
@@ -386,8 +386,8 @@ ChangeBox::
 	ret
 
 WhenYouChangeBoxText:
-	TX_FAR _WhenYouChangeBoxText
+	text_far _WhenYouChangeBoxText
-	db "@"
+	text_end
 
 CopyBoxToOrFromSRAM:
 ; copy an entire box from hl to de with b as the SRAM bank
@@ -490,8 +490,8 @@ DisplayChangeBoxMenu:
 	ret
 
 ChooseABoxText:
-	TX_FAR _ChooseABoxText
+	text_far _ChooseABoxText
-	db "@"
+	text_end
 
 BoxNames:
 	db   "BOX 1"

engine/menus/start_sub_menus.asm

@@ -190,8 +190,8 @@ StartMenu_Pokemon::
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
 .flashLightsAreaText
-	TX_FAR _FlashLightsAreaText
+	text_far _FlashLightsAreaText
-	db "@"
+	text_end
 .dig
 	ld a, ESCAPE_ROPE
 	ld [wcf91], a
@@ -225,14 +225,14 @@ StartMenu_Pokemon::
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
 .warpToLastPokemonCenterText
-	TX_FAR _WarpToLastPokemonCenterText
+	text_far _WarpToLastPokemonCenterText
-	db "@"
+	text_end
 .cannotUseTeleportNowText
-	TX_FAR _CannotUseTeleportNowText
+	text_far _CannotUseTeleportNowText
-	db "@"
+	text_end
 .cannotFlyHereText
-	TX_FAR _CannotFlyHereText
+	text_far _CannotFlyHereText
-	db "@"
+	text_end
 .softboiled
 	ld hl, wPartyMon1MaxHP
 	ld a, [wWhichPokemon]
@@ -270,8 +270,8 @@ StartMenu_Pokemon::
 	call PrintText
 	jp .loop
 .notHealthyEnoughText
-	TX_FAR _NotHealthyEnoughText
+	text_far _NotHealthyEnoughText
-	db "@"
+	text_end
 .goBackToMap
 	call RestoreScreenTilesAndReloadTilePatterns
 	jp CloseTextDisplay
@@ -280,8 +280,8 @@ StartMenu_Pokemon::
 	call PrintText
 	jp .loop
 .newBadgeRequiredText
-	TX_FAR _NewBadgeRequiredText
+	text_far _NewBadgeRequiredText
-	db "@"
+	text_end
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
 ErasePartyMenuCursors::
@@ -439,12 +439,12 @@ StartMenu_Item::
 	jp ItemMenuLoop
 
 CannotUseItemsHereText:
-	TX_FAR _CannotUseItemsHereText
+	text_far _CannotUseItemsHereText
-	db "@"
+	text_end
 
 CannotGetOffHereText:
-	TX_FAR _CannotGetOffHereText
+	text_far _CannotGetOffHereText
-	db "@"
+	text_end
 
 INCLUDE "data/items/use_party.asm"
 

engine/menus/text_box.asm

@@ -220,7 +220,9 @@ TextBoxTextAndCoordTable:
 BuySellQuitText:
 	db   "BUY"
 	next "SELL"
-	next "QUIT@@"
+	next "QUIT@"
+
+	db "@" ; unused
 
 UseTossText:
 	db   "USE"
@@ -245,7 +247,7 @@ JapaneseMainMenuText:
 	next "さいしょから@"
 
 BattleMenuText:
-	db   "FIGHT ",$E1,$E2
+	db   "FIGHT <PK><MN>"
 	next "ITEM  RUN@"
 
 SafariZoneBattleMenuText:
@@ -258,7 +260,7 @@ SwitchStatsCancelText:
 	next "CANCEL@"
 
 JapaneseAhText:
-	db "アッ!@"
+	db "アッ！@"
 
 JapanesePokedexMenu:
 	db   "データをみる"

engine/movie/hall_of_fame.asm

@@ -257,12 +257,12 @@ HoFMoneyText:
 	db "MONEY@"
 
 DexSeenOwnedText:
-	TX_FAR _DexSeenOwnedText
+	text_far _DexSeenOwnedText
-	db "@"
+	text_end
 
 DexRatingText:
-	TX_FAR _DexRatingText
+	text_far _DexRatingText
-	db "@"
+	text_end
 
 HoFRecordMonInfo:
 	ld hl, wHallOfFame

engine/movie/oak_speech/clear_save.asm

@@ -19,5 +19,5 @@ DoClearSaveDialogue:
 	jp Init
 
 ClearSaveDataText:
-	TX_FAR _ClearSaveDataText
+	text_far _ClearSaveDataText
-	db "@"
+	text_end

engine/movie/oak_speech/oak_speech.asm

@@ -153,22 +153,22 @@ OakSpeech:
 	call GBFadeOutToWhite
 	jp ClearScreen
 OakSpeechText1:
-	TX_FAR _OakSpeechText1
+	text_far _OakSpeechText1
-	db "@"
+	text_end
 OakSpeechText2:
-	TX_FAR _OakSpeechText2A
+	text_far _OakSpeechText2A
-	TX_CRY_NIDORINA
+	sound_cry_nidorina
-	TX_FAR _OakSpeechText2B
+	text_far _OakSpeechText2B
-	db "@"
+	text_end
 IntroducePlayerText:
-	TX_FAR _IntroducePlayerText
+	text_far _IntroducePlayerText
-	db "@"
+	text_end
 IntroduceRivalText:
-	TX_FAR _IntroduceRivalText
+	text_far _IntroduceRivalText
-	db "@"
+	text_end
 OakSpeechText3:
-	TX_FAR _OakSpeechText3
+	text_far _OakSpeechText3
-	db "@"
+	text_end
 
 FadeInIntroPic:
 	ld hl, IntroFadePalettes

engine/movie/oak_speech/oak_speech2.asm

@@ -28,8 +28,8 @@ ChoosePlayerName:
 	jp PrintText
 
 YourNameIsText:
-	TX_FAR _YourNameIsText
+	text_far _YourNameIsText
-	db "@"
+	text_end
 
 ChooseRivalName:
 	call OakSpeechSlidePicRight
@@ -61,8 +61,8 @@ ChooseRivalName:
 	jp PrintText
 
 HisNameIsText:
-	TX_FAR _HisNameIsText
+	text_far _HisNameIsText
-	db "@"
+	text_end
 
 OakSpeechSlidePicLeft:
 	push de
@@ -215,5 +215,5 @@ GetDefaultName:
 
 INCLUDE "data/player_names_list.asm"
 
-TextTerminator_6b20:
+LinkMenuEmptyText:
-	db "@"
+	text_end

engine/movie/trade.asm

@@ -785,8 +785,8 @@ PrintTradeWentToText:
 	jp Trade_SlideTextBoxOffScreen
 
 TradeWentToText:
-	TX_FAR _TradeWentToText
+	text_far _TradeWentToText
-	db "@"
+	text_end
 
 PrintTradeForSendsText:
 	ld hl, TradeForText
@@ -797,12 +797,12 @@ PrintTradeForSendsText:
 	jp Trade_Delay80
 
 TradeForText:
-	TX_FAR _TradeForText
+	text_far _TradeForText
-	db "@"
+	text_end
 
 TradeSendsText:
-	TX_FAR _TradeSendsText
+	text_far _TradeSendsText
-	db "@"
+	text_end
 
 PrintTradeFarewellText:
 	ld hl, TradeWavesFarewellText
@@ -814,12 +814,12 @@ PrintTradeFarewellText:
 	jp Trade_SlideTextBoxOffScreen
 
 TradeWavesFarewellText:
-	TX_FAR _TradeWavesFarewellText
+	text_far _TradeWavesFarewellText
-	db "@"
+	text_end
 
 TradeTransferredText:
-	TX_FAR _TradeTransferredText
+	text_far _TradeTransferredText
-	db "@"
+	text_end
 
 PrintTradeTakeCareText:
 	ld hl, TradeTakeCareText
@@ -827,8 +827,8 @@ PrintTradeTakeCareText:
 	jp Trade_Delay80
 
 TradeTakeCareText:
-	TX_FAR _TradeTakeCareText
+	text_far _TradeTakeCareText
-	db "@"
+	text_end
 
 PrintTradeWillTradeText:
 	ld hl, TradeWillTradeText
@@ -839,12 +839,12 @@ PrintTradeWillTradeText:
 	jp Trade_Delay80
 
 TradeWillTradeText:
-	TX_FAR _TradeWillTradeText
+	text_far _TradeWillTradeText
-	db "@"
+	text_end
 
 TradeforText:
-	TX_FAR _TradeforText
+	text_far _TradeforText
-	db "@"
+	text_end
 
 Trade_ShowAnimation:
 	ld [wAnimationID], a

engine/movie/trade2.asm

@@ -43,6 +43,7 @@ Trade_PrintEnemyMonInfoText:
 	jp PrintNumber
 
 Trade_MonInfoText:
-	db "──№⠄",$4E
+	db   "──№<DOT>"
+	next ""
 	next "OT/"
-	next $73,"№⠄","@"
+	next "<ID>№<DOT>@"

engine/overworld/cut.asm

@@ -22,8 +22,8 @@ UsedCut:
 	jp PrintText
 
 .NothingToCutText
-	TX_FAR _NothingToCutText
+	text_far _NothingToCutText
-	db "@"
+	text_end
 
 .canCut
 	ld [wCutTile], a
@@ -68,8 +68,8 @@ UsedCut:
 	jp RedrawMapView
 
 UsedCutText:
-	TX_FAR _UsedCutText
+	text_far _UsedCutText
-	db "@"
+	text_end
 
 InitCutAnimOAM:
 	xor a

engine/overworld/field_move_messages.asm

@@ -7,16 +7,16 @@ PrintStrengthTxt:
 	jp PrintText
 
 UsedStrengthText:
-	TX_FAR _UsedStrengthText
+	text_far _UsedStrengthText
-	TX_ASM
+	text_asm
 	ld a, [wcf91]
 	call PlayCry
 	call Delay3
 	jp TextScriptEnd
 
 CanMoveBouldersText:
-	TX_FAR _CanMoveBouldersText
+	text_far _CanMoveBouldersText
-	db "@"
+	text_end
 
 IsSurfingAllowed:
 ; Returns whether surfing is allowed in bit 1 of wd728.
@@ -49,9 +49,9 @@ CoordsData_cdf7:
 	db $0B,$07,$FF
 
 CurrentTooFastText:
-	TX_FAR _CurrentTooFastText
+	text_far _CurrentTooFastText
-	db "@"
+	text_end
 
 CyclingIsFunText:
-	TX_FAR _CyclingIsFunText
+	text_far _CyclingIsFunText
-	db "@"
+	text_end

engine/overworld/map_sprites.asm

@@ -133,7 +133,7 @@ LoadMapSpriteTilePatterns:
 	jr nc, .fourTileSpriteVRAMAddr
 	ld d, a
 	dec d
-; vSprites += [hVRAMSlot] * $C0 (the number of bytes in 12 tiles)
+; hl = vSprites + [hVRAMSlot] * $C0 (the number of bytes in 12 tiles)
 .calculateVRAMAddrLoop
 	add hl, bc
 	dec d

engine/overworld/player_animations.asm

@@ -457,16 +457,16 @@ FishingAnim:
 	ret
 
 NoNibbleText:
-	TX_FAR _NoNibbleText
+	text_far _NoNibbleText
-	db "@"
+	text_end
 
 NothingHereText:
-	TX_FAR _NothingHereText
+	text_far _NothingHereText
-	db "@"
+	text_end
 
 ItsABiteText:
-	TX_FAR _ItsABiteText
+	text_far _ItsABiteText
-	db "@"
+	text_end
 
 FishingRodOAM:
 ; specifies how the fishing rod should be drawn on the screen

engine/pokemon/bills_pc.asm

@@ -89,7 +89,7 @@ SomeonesPCText:   db "SOMEONE's PC@"
 BillsPCText:      db "BILL's PC@"
 PlayersPCText:    db "'s PC@"
 OaksPCText:       db "PROF.OAK's PC@"
-PKMNLeaguePCText: db "<pkmn>LEAGUE@"
+PKMNLeaguePCText: db "<PKMN>LEAGUE@"
 LogOffPCText:     db "LOG OFF@"
 
 BillsPC_::
@@ -339,9 +339,9 @@ DisplayMonListMenu:
 	ret
 
 BillsPCMenuText:
-	db   "WITHDRAW <pkmn>"
+	db   "WITHDRAW <PKMN>"
-	next "DEPOSIT <pkmn>"
+	next "DEPOSIT <PKMN>"
-	next "RELEASE <pkmn>"
+	next "RELEASE <PKMN>"
 	next "CHANGE BOX"
 	next "SEE YA!"
 	db "@"
@@ -453,52 +453,52 @@ StatsCancelPCText:
 	next "CANCEL@"
 
 SwitchOnText:
-	TX_FAR _SwitchOnText
+	text_far _SwitchOnText
-	db "@"
+	text_end
 
 WhatText:
-	TX_FAR _WhatText
+	text_far _WhatText
-	db "@"
+	text_end
 
 DepositWhichMonText:
-	TX_FAR _DepositWhichMonText
+	text_far _DepositWhichMonText
-	db "@"
+	text_end
 
 MonWasStoredText:
-	TX_FAR _MonWasStoredText
+	text_far _MonWasStoredText
-	db "@"
+	text_end
 
 CantDepositLastMonText:
-	TX_FAR _CantDepositLastMonText
+	text_far _CantDepositLastMonText
-	db "@"
+	text_end
 
 BoxFullText:
-	TX_FAR _BoxFullText
+	text_far _BoxFullText
-	db "@"
+	text_end
 
 MonIsTakenOutText:
-	TX_FAR _MonIsTakenOutText
+	text_far _MonIsTakenOutText
-	db "@"
+	text_end
 
 NoMonText:
-	TX_FAR _NoMonText
+	text_far _NoMonText
-	db "@"
+	text_end
 
 CantTakeMonText:
-	TX_FAR _CantTakeMonText
+	text_far _CantTakeMonText
-	db "@"
+	text_end
 
 ReleaseWhichMonText:
-	TX_FAR _ReleaseWhichMonText
+	text_far _ReleaseWhichMonText
-	db "@"
+	text_end
 
 OnceReleasedText:
-	TX_FAR _OnceReleasedText
+	text_far _OnceReleasedText
-	db "@"
+	text_end
 
 MonWasReleasedText:
-	TX_FAR _MonWasReleasedText
+	text_far _MonWasReleasedText
-	db "@"
+	text_end
 
 CableClubLeftGameboy::
 	ld a, [hSerialConnectionStatus]
@@ -535,8 +535,8 @@ CableClubRightGameboy::
 	tx_pre_jump JustAMomentText
 
 JustAMomentText::
-	TX_FAR _JustAMomentText
+	text_far _JustAMomentText
-	db "@"
+	text_end
 
 	ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction
 	cp SPRITE_FACING_UP
@@ -545,5 +545,5 @@ JustAMomentText::
 	tx_pre_jump OpenBillsPCText
 
 OpenBillsPCText::
-	TX_BILLS_PC
+	script_bills_pc
 

engine/pokemon/evos_moves.asm

@@ -296,20 +296,20 @@ CancelledEvolution:
 	jp Evolution_PartyMonLoop
 
 EvolvedText:
-	TX_FAR _EvolvedText
+	text_far _EvolvedText
-	db "@"
+	text_end
 
 IntoText:
-	TX_FAR _IntoText
+	text_far _IntoText
-	db "@"
+	text_end
 
 StoppedEvolvingText:
-	TX_FAR _StoppedEvolvingText
+	text_far _StoppedEvolvingText
-	db "@"
+	text_end
 
 IsEvolvingText:
-	TX_FAR _IsEvolvingText
+	text_far _IsEvolvingText
-	db "@"
+	text_end
 
 Evolution_ReloadTilesetTilePatterns:
 	ld a, [wLinkState]

engine/pokemon/learn_move.asm

@@ -184,43 +184,43 @@ TryingToLearn:
 	ret
 
 LearnedMove1Text:
-	TX_FAR _LearnedMove1Text
+	text_far _LearnedMove1Text
-	TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
+	sound_get_item_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
-	TX_BLINK
+	text_promptbutton
-	db "@"
+	text_end
 
 WhichMoveToForgetText:
-	TX_FAR _WhichMoveToForgetText
+	text_far _WhichMoveToForgetText
-	db "@"
+	text_end
 
 AbandonLearningText:
-	TX_FAR _AbandonLearningText
+	text_far _AbandonLearningText
-	db "@"
+	text_end
 
 DidNotLearnText:
-	TX_FAR _DidNotLearnText
+	text_far _DidNotLearnText
-	db "@"
+	text_end
 
 TryingToLearnText:
-	TX_FAR _TryingToLearnText
+	text_far _TryingToLearnText
-	db "@"
+	text_end
 
 OneTwoAndText:
-	TX_FAR _OneTwoAndText
+	text_far _OneTwoAndText
-	TX_DELAY
+	text_pause
-	TX_ASM
+	text_asm
 	ld a, SFX_SWAP
 	call PlaySoundWaitForCurrent
 	ld hl, PoofText
 	ret
 
 PoofText:
-	TX_FAR _PoofText
+	text_far _PoofText
-	TX_DELAY
+	text_pause
 ForgotAndText:
-	TX_FAR _ForgotAndText
+	text_far _ForgotAndText
-	db "@"
+	text_end
 
 HMCantDeleteText:
-	TX_FAR _HMCantDeleteText
+	text_far _HMCantDeleteText
-	db "@"
+	text_end