ref: 8431fa7756dace97413f4c35aaa44cd92cf5b6df
parent: 80621d3731b6767ad2e60116cab34a895d29ff9c
author: U-Daniel-PC\Daniel <corrnondacqb@yahoo.com>
date: Fri Jul 3 10:58:50 EDT 2015
TX_ASM
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -139,22 +139,22 @@
GoText: ; 58eae (16:4eae)
TX_FAR _GoText
- db $08 ; asm
+ TX_ASM
jr PrintPlayerMon1Text
DoItText: ; 58eb5 (16:4eb5)
TX_FAR _DoItText
- db $08 ; asm
+ TX_ASM
jr PrintPlayerMon1Text
GetmText: ; 58ebc (16:4ebc)
TX_FAR _GetmText
- db $08 ; asm
+ TX_ASM
jr PrintPlayerMon1Text
EnemysWeakText: ; 58ec3 (16:4ec3)
TX_FAR _EnemysWeakText
- db $08 ; asm
+ TX_ASM
PrintPlayerMon1Text:
ld hl, PlayerMon1Text
@@ -170,7 +170,7 @@
PlayerMon2Text: ; 58ed7 (16:4ed7)
TX_FAR _PlayerMon2Text
- db $08 ; asm
+ TX_ASM
push de
push bc
ld hl, wEnemyMonHP + 1
@@ -216,17 +216,17 @@
EnoughText: ; 58f25 (16:4f25)
TX_FAR _EnoughText
- db $08 ; asm
+ TX_ASM
jr PrintComeBackText
OKExclamationText: ; 58f2c (16:4f2c)
TX_FAR _OKExclamationText
- db $08 ; asm
+ TX_ASM
jr PrintComeBackText
GoodText: ; 58f33 (16:4f33)
TX_FAR _GoodText
- db $08 ; asm
+ TX_ASM
jr PrintComeBackText
PrintComeBackText: ; 58f3a (16:4f3a)
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3773,7 +3773,7 @@
; but the functionality didn't get removed
MonName1Text: ; 3dafb (f:5afb)
TX_FAR _MonName1Text
- db $08 ; asm
+ TX_ASM
ld a, [H_WHOSETURN]
and a
ld a, [W_PLAYERMOVENUM]
@@ -3798,12 +3798,12 @@
Used1Text: ; 3db2d (f:5b2d)
TX_FAR _Used1Text
- db $08 ; asm
+ TX_ASM
jr PrintInsteadText
Used2Text: ; 3db34 (f:5b34)
TX_FAR _Used2Text
- db $08 ; asm
+ TX_ASM
; fall through
PrintInsteadText: ; 3db39 (f:5b39)
@@ -3815,7 +3815,7 @@
InsteadText: ; 3db43 (f:5b43)
TX_FAR _InsteadText
- db $08 ; asm
+ TX_ASM
; fall through
PrintMoveName: ; 3db48 (f:5b48)
@@ -3824,7 +3824,7 @@
_PrintMoveName: ; 3db4c (f:5b4c)
TX_FAR _CF4BText
- db $08 ; asm
+ TX_ASM
ld hl, ExclamationPointPointerTable
ld a, [wd11e] ; exclamation point num
add a
@@ -7710,7 +7710,7 @@
MonsStatsRoseText: ; 3f528 (f:7528)
TX_FAR _MonsStatsRoseText
- db $08 ; asm
+ TX_ASM
ld hl, GreatlyRoseText
ld a, [H_WHOSETURN]
and a
@@ -7912,7 +7912,7 @@
MonsStatsFellText: ; 3f661 (f:7661)
TX_FAR _MonsStatsFellText
- db $08 ; asm
+ TX_ASM
ld hl, FellText
ld a, [H_WHOSETURN]
and a
@@ -8246,7 +8246,7 @@
ChargeMoveEffectText: ; 3f8c8 (f:78c8)
TX_FAR _ChargeMoveEffectText
- db $08 ; asm
+ TX_ASM
ld a, [wWhichTrade]
cp RAZOR_WIND
ld hl, MadeWhirlwindText
--- a/engine/battle/experience.asm
+++ b/engine/battle/experience.asm
@@ -341,7 +341,7 @@
GainedText: ; 554b2 (15:54b2)
TX_FAR _GainedText
- db $08 ; asm
+ TX_ASM
ld a, [wBoostExpByExpAll]
ld hl, WithExpAllText
and a
@@ -355,7 +355,7 @@
WithExpAllText: ; 554cb (15:54cb)
TX_FAR _WithExpAllText
- db $08 ; asm
+ TX_ASM
ld hl, ExpPointsText
ret
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -11,7 +11,7 @@
db "@"
ViridianSchoolNotebook: ; 529aa (14:69aa)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianSchoolNotebookText1
call PrintText
call TurnPageSchoolNotebook
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -95,7 +95,7 @@
ret
LinkCableHelp: ; 5dc29 (17:5c29)
- db $08 ; asm
+ TX_ASM
call SaveScreenTilesToBuffer1
ld hl, LinkCableHelpText1
call PrintText
@@ -179,7 +179,7 @@
db "@"
ViridianSchoolBlackboard: ; 5dced (17:5ced)
- db $08 ; asm
+ TX_ASM
call SaveScreenTilesToBuffer1
ld hl, ViridianSchoolBlackboardText1
call PrintText
@@ -428,7 +428,7 @@
VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8)
TX_FAR _VermilionGymTrashSuccesText1
- db $08 ; asm
+ TX_ASM
call WaitForSoundToFinish
ld a, (SFX_02_49 - SFX_Headers_02) / 3
call PlaySound
@@ -442,7 +442,7 @@
; unused
VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0)
- db $08 ; asm
+ TX_ASM
call WaitForSoundToFinish
ld a, (SFX_02_49 - SFX_Headers_02) / 3
call PlaySound
@@ -451,7 +451,7 @@
VermilionGymTrashSuccesText3: ; 5deef (17:5eef)
TX_FAR _VermilionGymTrashSuccesText3
- db $08 ; asm
+ TX_ASM
call WaitForSoundToFinish
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
@@ -460,7 +460,7 @@
VermilionGymTrashFailText: ; 5df02 (17:5f02)
TX_FAR _VermilionGymTrashFailText
- db $08 ; asm
+ TX_ASM
call WaitForSoundToFinish
ld a, (SFX_02_51 - SFX_Headers_02) / 3
call PlaySound
--- a/engine/hidden_object_functions18.asm
+++ b/engine/hidden_object_functions18.asm
@@ -139,7 +139,7 @@
db "@"
SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4)
- db $8 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SaffronCityPokecenterBenchGuyText2
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -60,7 +60,7 @@
db $FF
IndigoPlateauStatues: ; fbbf (3:7bbf)
- db $08 ; asm
+ TX_ASM
ld hl, IndigoPlateauStatuesText1
call PrintText
ld a, [W_XCOORD]
@@ -85,7 +85,7 @@
db "@"
BookOrSculptureText: ; fbe8 (3:7be8)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonBooksText
ld a, [W_CURMAPTILESET]
cp MANSION ; Celadon Mansion tileset
@@ -113,7 +113,7 @@
TownMapText: ; fc12 (3:7c12)
TX_FAR _TownMapText
db $06
- db $08 ; asm
+ TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd730
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -99,7 +99,7 @@
jp PrintText
SafariGameOverText: ; 1e9f7 (7:69f7)
- db $08 ; asm
+ TX_ASM
ld a, [W_NUMSAFARIBALLS]
and a
jr z, .asm_1ea04
@@ -127,7 +127,7 @@
jp PrintPredefTextID
CinnabarGymQuiz: ; 1ea25 (7:6a25)
- db $08 ; asm
+ TX_ASM
xor a
ld [wda38], a
ld a, [wWhichTrade]
@@ -375,7 +375,7 @@
BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
TX_FAR _BillsHouseInitiatedText
db $06
- db $08 ; asm
+ TX_ASM
ld a, $ff
ld [wc0ee], a
call PlaySound
@@ -389,7 +389,7 @@
jp TextScriptEnd
BillsHousePokemonList: ; 1ec05 (7:6c05)
- db $08 ; asm
+ TX_ASM
call SaveScreenTilesToBuffer1
ld hl, BillsHousePokemonListText1
call PrintText
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -206,7 +206,7 @@
OneTwoAndText: ; 6fc8 (1:6fc8)
TX_FAR _OneTwoAndText
db $a
- db $8
+ TX_ASM
ld a, (SFX_02_58 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
ld hl, PoofText
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -23,7 +23,7 @@
FoundHiddenItemText: ; 7675b (1d:675b)
TX_FAR _FoundHiddenItemText
- db $8
+ TX_ASM
ld a, [wWhichTrade] ; item ID
ld b, a
ld c, 1
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -456,7 +456,7 @@
jp .loop
SlotsMachineText_37665: ; 37665 (d:7665)
- db $08 ; asm
+ TX_ASM
push bc
call SlotMachine_37728
ld hl, LinedUpText
--- a/home.asm
+++ b/home.asm
@@ -971,7 +971,7 @@
Predef5CText:: ; 24f4 (0:24f4)
; XXX better label (what does predef $5C do?)
- db $08 ; asm
+ TX_ASM
predef PickupItem
jp TextScriptEnd
@@ -2584,7 +2584,7 @@
TrainerEndBattleText:: ; 33cf (0:33cf)
TX_FAR _TrainerNameText
- db $08
+ TX_ASM
call GetSavedEndBattleTextPointer
call TextCommandProcessor
jp TextScriptEnd
--- a/macros.asm
+++ b/macros.asm
@@ -195,6 +195,10 @@
db \2
ENDM
+TX_ASM: MACRO
+ db $08
+ ENDM
+
; Predef macro.
add_predef: MACRO
\1Predef::
--- a/main.asm
+++ b/main.asm
@@ -2726,7 +2726,7 @@
UsedStrengthText: ; cdaa (3:4daa)
TX_FAR _UsedStrengthText
- db $08 ; asm
+ TX_ASM
ld a, [wcf91]
call PlayCry
call Delay3
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -135,7 +135,7 @@
db $ff
AgathaText1: ; 76516 (1d:6516)
- db $08 ; asm
+ TX_ASM
ld hl, AgathaTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -7,7 +7,7 @@
dw BikeShopText3
BikeShopText1: ; 1d745 (7:5745)
- db $08 ; asm
+ TX_ASM
ld a, [wd75f]
bit 0, a
jr z, .asm_260d4
@@ -120,7 +120,7 @@
db "@"
BikeShopText2: ; 1d839 (7:5839)
- db $08 ; asm
+ TX_ASM
ld hl, BikeShopText_1d843
call PrintText
jp TextScriptEnd
@@ -130,7 +130,7 @@
db "@"
BikeShopText3: ; 1d848 (7:5848)
- db $08 ; asm
+ TX_ASM
ld a, [wd75f]
bit 0, a
ld hl, BikeShopText_1d861
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -115,7 +115,7 @@
db $fd
BillsHouseText1: ; 1e83d (7:683d)
- db $8
+ TX_ASM
ld hl, BillsHouseText_1e865
call PrintText
call YesNoChoice
@@ -148,7 +148,7 @@
db "@"
BillsHouseText2: ; 1e874 (7:6874)
- db $08 ; asm
+ TX_ASM
ld a, [wd7f2]
bit 4, a
jr nz, .asm_1e8a9
@@ -194,7 +194,7 @@
db "@"
BillsHouseText3: ; 1e8d0 (7:68d0)
- db $08 ; asm
+ TX_ASM
ld hl, BillsHouseText_1e8da
call PrintText
jp TextScriptEnd
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -132,7 +132,7 @@
db $ff
BrunoText1: ; 763b9 (1d:63b9)
- db $08 ; asm
+ TX_ASM
ld hl, BrunoTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/celadoncity.asm
+++ b/scripts/celadoncity.asm
@@ -44,7 +44,7 @@
db "@"
CeladonCityText5: ; 1999e (6:599e)
- db $08 ; asm
+ TX_ASM
ld a, [wd777]
bit 0, a
jr nz, .asm_7053f
@@ -90,7 +90,7 @@
CeladonCityText7: ; 199ec (6:59ec)
TX_FAR _CeladonCityText7
- db $08 ; asm
+ TX_ASM
ld a, POLIWRATH
call PlayCry
jp TextScriptEnd
--- a/scripts/celadondiner.asm
+++ b/scripts/celadondiner.asm
@@ -26,7 +26,7 @@
db "@"
CeladonDinerText5: ; 49173 (12:5173)
- db $08 ; asm
+ TX_ASM
ld a, [wd783]
bit 0, a
jr nz, .asm_eb14d
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -124,7 +124,7 @@
db "@"
CeladonGameCornerText2: ; 48ca9 (12:4ca9)
- db $08 ; asm
+ TX_ASM
call CeladonGameCornerScript_48f1e
ld hl, CeladonGameCornerText_48d22
call PrintText
@@ -213,7 +213,7 @@
db "@"
CeladonGameCornerText5: ; 48d4a (12:4d4a)
- db $08 ; asm
+ TX_ASM
ld a, [wd77e]
bit 2, a
jr nz, .asm_48d89
@@ -272,7 +272,7 @@
db "@"
CeladonGameCornerText7: ; 48db6 (12:4db6)
- db $08 ; asm
+ TX_ASM
ld a, [wd77c]
bit 1, a
ld hl, CeladonGameCornerText_48dca
@@ -295,7 +295,7 @@
db "@"
CeladonGameCornerText9: ; 48dd9 (12:4dd9)
- db $08 ; asm
+ TX_ASM
ld a, [wd77e]
bit 4, a
jr nz, .asm_48e13
@@ -348,7 +348,7 @@
db "@"
CeladonGameCornerText10: ; 48e3b (12:4e3b)
- db $08 ; asm
+ TX_ASM
ld a, [wd77e]
bit 3, a
jr nz, .asm_48e75
@@ -401,7 +401,7 @@
db "@"
CeladonGameCornerText11: ; 48e9d (12:4e9d)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGameCornerText_48ece
call PrintText
ld hl, wd72d
@@ -435,7 +435,7 @@
db "@"
CeladonGameCornerText12: ; 48edd (12:4edd)
- db $08 ; asm
+ TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CeladonGameCornerText_48f09
@@ -454,7 +454,7 @@
CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
TX_FAR _CeladonGameCornerText_48f09
- db $8
+ TX_ASM
ld a, (SFX_02_49 - SFX_Headers_02) / 3
call PlaySound
call WaitForSoundToFinish
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -156,7 +156,7 @@
db $ff
CeladonGymText1: ; 48a11 (12:4a11)
- db $08 ; asm
+ TX_ASM
ld a, [wd77c]
bit 1, a
jr z, .asm_48a2d
@@ -217,7 +217,7 @@
db "@"
CeladonGymText2: ; 48a81 (12:4a81)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -235,7 +235,7 @@
db "@"
CeladonGymText3: ; 48a9a (12:4a9a)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -253,7 +253,7 @@
db "@"
CeladonGymText4: ; 48ab3 (12:4ab3)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -271,7 +271,7 @@
db "@"
CeladonGymText5: ; 48acc (12:4acc)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -289,7 +289,7 @@
db "@"
CeladonGymText6: ; 48ae5 (12:4ae5)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -307,7 +307,7 @@
db "@"
CeladonGymText7: ; 48afe (12:4afe)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -325,7 +325,7 @@
db "@"
CeladonGymText8: ; 48b17 (12:4b17)
- db $08 ; asm
+ TX_ASM
ld hl, CeladonGymTrainerHeader7
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/celadonmansion1.asm
+++ b/scripts/celadonmansion1.asm
@@ -14,7 +14,7 @@
CeladonMansion1Text1: ; 486a7 (12:46a7)
TX_FAR _CeladonMansion1Text1
- db $08 ; asm
+ TX_ASM
ld a, MEOWTH
jp CeladonMansion1_486a1
@@ -24,13 +24,13 @@
CeladonMansion1Text3: ; 486b6 (12:46b6)
TX_FAR _CeladonMansion1Text3
- db $8
+ TX_ASM
ld a, CLEFAIRY
jp CeladonMansion1_486a1
CeladonMansion1Text4: ; 486c0 (12:46c0)
TX_FAR _CeladonMansion1Text4
- db $8
+ TX_ASM
ld a, NIDORAN_F
jp CeladonMansion1_486a1
--- a/scripts/celadonmansion3.asm
+++ b/scripts/celadonmansion3.asm
@@ -24,7 +24,7 @@
db "@"
DirectorText: ; 487b2 (12:47b2)
- db $08 ; asm
+ TX_ASM
; check pokédex
ld hl, wPokedexOwned
@@ -48,7 +48,7 @@
.CompletedDexText
TX_FAR _CompletedDexText
db $6
- db $8 ; asm
+ TX_ASM
callab DisplayDiploma
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@@ -10,7 +10,7 @@
db "@"
CeladonMansion5Text2: ; 1dd46 (7:5d46)
- db $08 ; asm
+ TX_ASM
ld bc,(EEVEE << 8) | 25
call GivePokemon
jr nc, .asm_24365
--- a/scripts/celadonmart3.asm
+++ b/scripts/celadonmart3.asm
@@ -21,7 +21,7 @@
dw CeladonMart3Text17
CeladonMart3Text1: ; 4824a (12:424a)
- db $08 ; asm
+ TX_ASM
ld a, [wd778]
bit 7, a
jr nz, .asm_a5463
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -63,7 +63,7 @@
dw CeladonMartElevatorText1
CeladonMartElevatorText1: ; 4865e (12:465e)
- db $08 ; asm
+ TX_ASM
call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps
predef Func_1c9c6
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -224,7 +224,7 @@
db "@"
CeladonMartRoofText2: ; 4856c (12:456c)
- db $08 ; asm
+ TX_ASM
call CeladonMartRoofScript_483d8
ld a, [wcd37]
and a
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -234,7 +234,7 @@
dw CeruleanCityText17
CeruleanCityText1: ; 1964f (6:564f)
- db $08 ; asm
+ TX_ASM
ld a, [wd75a] ; rival battle flag
bit 0, a
; do pre-battle text
@@ -266,7 +266,7 @@
db "@"
CeruleanCityText2: ; 1967c (6:567c)
- db $8
+ TX_ASM
ld a, [wd75b]
bit 7, a
jr nz, .asm_4ca20
@@ -343,7 +343,7 @@
db "@"
CeruleanCityText7: ; 1970c (6:570c)
- db $08 ; asm
+ TX_ASM
ldh a, [$d3]
cp $b4
jr c, .asm_e9fc9
@@ -375,7 +375,7 @@
db "@"
CeruleanCityText8: ; 1973f (6:573f)
- db $08 ; asm
+ TX_ASM
ld a, [hRandomAdd]
cp $b4
jr c, .asm_e28da
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -105,7 +105,7 @@
db $ff
CeruleanGymText1: ; 5c771 (17:4771)
- db $08 ; asm
+ TX_ASM
ld a, [wd75e]
bit 7, a
jr z, .asm_5c78d
@@ -166,7 +166,7 @@
db $11, $6, "@"
CeruleanGymText2: ; 5c7df (17:47df)
- db $08 ; asm
+ TX_ASM
ld hl, CeruleanGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -184,7 +184,7 @@
db "@"
CeruleanGymText3: ; 5c7f8 (17:47f8)
- db $08 ; asm
+ TX_ASM
ld hl, CeruleanGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -202,7 +202,7 @@
db "@"
CeruleanGymText4: ; 5c811 (17:4811)
- db $08 ; asm
+ TX_ASM
ld a, [wd75e]
bit 7, a
jr nz, .asm_5c821
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/ceruleanhouse1.asm
@@ -10,7 +10,7 @@
db "@"
CeruleanHouse1Text2: ; 1d702 (7:5702)
- db $08 ; asm
+ TX_ASM
ld a, $6
ld [wWhichTrade], a
predef DoInGameTradeDialogue
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/ceruleanhouse2.asm
@@ -9,7 +9,7 @@
dw CeruleanHouse2Text1
CeruleanHouse2Text1: ; 74e15 (1d:4e15)
- db $8
+ TX_ASM
ld hl, CeruleanHouse2Text_74e77
call PrintText
xor a
--- a/scripts/ceruleanhousetrashed.asm
+++ b/scripts/ceruleanhousetrashed.asm
@@ -8,7 +8,7 @@
dw CeruleanHouseTrashedText3
CeruleanHouseTrashedText1: ; 1d68f (7:568f)
- db $08 ; asm
+ TX_ASM
ld b, $e4
predef IsItemInBag_
and b
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -206,7 +206,7 @@
jp TextScriptEnd
CinnabarGymText1: ; 758df (1d:58df)
- db $8
+ TX_ASM
ld a, [wd79a]
bit 1, a
jr z, .asm_d9332
@@ -258,7 +258,7 @@
db "@"
CinnabarGymText2: ; 75939 (1d:5939)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 2, a
@@ -287,7 +287,7 @@
db "@"
CinnabarGymText3: ; 7596e (1d:596e)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 3, a
@@ -316,7 +316,7 @@
db "@"
CinnabarGymText4: ; 759a3 (1d:59a3)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 4, a
@@ -345,7 +345,7 @@
db "@"
CinnabarGymText5: ; 759d8 (1d:59d8)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 5, a
@@ -374,7 +374,7 @@
db "@"
CinnabarGymText6: ; 75a0d (1d:5a0d)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 6, a
@@ -403,7 +403,7 @@
db "@"
CinnabarGymText7: ; 75a42 (1d:5a42)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 7, a
@@ -432,7 +432,7 @@
db "@"
CinnabarGymText8: ; 75a77 (1d:5a77)
- db $08 ; asm
+ TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79b]
bit 0, a
@@ -461,7 +461,7 @@
db "@"
CinnabarGymText9: ; 75aac (1d:5aac)
- db $08 ; asm
+ TX_ASM
ld a, [wd79a]
bit 1, a
jr nz, .asm_627d9
--- a/scripts/copycatshouse1f.asm
+++ b/scripts/copycatshouse1f.asm
@@ -16,7 +16,7 @@
CopycatsHouse1FText3: ; 75ed6 (1d:5ed6)
TX_FAR _CopycatsHouse1FText3
- db $8
+ TX_ASM
ld a, CHANSEY
call PlayCry
jp TextScriptEnd
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/copycatshouse2f.asm
@@ -11,7 +11,7 @@
dw CopycatsHouse2FText7
CopycatsHouse2FText1: ; 5cc82 (17:4c82)
- db $08 ; asm
+ TX_ASM
ld a, [wd7af]
bit 0, a
jr nz, .asm_7ccf3
@@ -83,7 +83,7 @@
db "@"
CopycatsHouse2FText7: ; 5cd03 (17:4d03)
- db $08 ; asm
+ TX_ASM
ld a, [wSpriteStateData1 + 9]
cp $4
ld hl, CopycatsHouse2FText_5cd1c
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -5,7 +5,7 @@
dw DayCareMText1
DayCareMText1: ; 56254 (15:6254)
- db $8
+ TX_ASM
call SaveScreenTilesToBuffer2
ld a, [W_DAYCARE_IN_USE]
and a
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -24,7 +24,7 @@
FanClubText1:
; pikachu fan
- db $08 ; asm
+ TX_ASM
ld a, [wd771]
bit 7, a
jr nz, .mineisbetter
@@ -51,7 +51,7 @@
FanClubText2:
; seel fan
- db $08 ; asm
+ TX_ASM
ld a, [wd771]
bit 6, a
jr nz, .mineisbetter
@@ -78,7 +78,7 @@
FanClubText3:
; pikachu
- db $8
+ TX_ASM
ld hl, .text
call PrintText
ld a, PIKACHU
@@ -92,7 +92,7 @@
FanClubText4:
; seel
- db $08 ; asm
+ TX_ASM
ld hl, .text
call PrintText
ld a, SEEL
@@ -106,7 +106,7 @@
FanClubText5:
; chair
- db $08 ; asm
+ TX_ASM
call FanClubBikeInBag
jr nz, .nothingleft
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -134,7 +134,7 @@
db $ff
FightingDojoText1: ; 5ce44 (17:4e44)
- db $08 ; asm
+ TX_ASM
ld a, [wd7b1]
bit 0, a
jp nz, .continue1
@@ -183,7 +183,7 @@
db "@"
FightingDojoText2: ; 5cea2 (17:4ea2)
- db $08 ; asm
+ TX_ASM
ld hl, FightingDojoTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -201,7 +201,7 @@
db "@"
FightingDojoText3: ; 5cebb (17:4ebb)
- db $08 ; asm
+ TX_ASM
ld hl, FightingDojoTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -219,7 +219,7 @@
db "@"
FightingDojoText4: ; 5ced4 (17:4ed4)
- db $08 ; asm
+ TX_ASM
ld hl, FightingDojoTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -237,7 +237,7 @@
db "@"
FightingDojoText5: ; 5ceed (17:4eed)
- db $08 ; asm
+ TX_ASM
ld hl, FightingDojoTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -256,7 +256,7 @@
FightingDojoText6: ; 5cf06 (17:4f06)
; Hitmonlee Poké Ball
- db $08 ; asm
+ TX_ASM
ld a, [wd7b1]
and %11000000
jr z, .GetMon
@@ -294,7 +294,7 @@
FightingDojoText7: ; 5cf4e (17:4f4e)
; Hitmonchan Poké Ball
- db $08 ; asm
+ TX_ASM
ld a, [wd7b1]
and %11000000
jr z, .GetMon
--- a/scripts/fuchsiacity.asm
+++ b/scripts/fuchsiacity.asm
@@ -74,7 +74,7 @@
db "@"
FuchsiaCityText19: ; 19a90 (6:5a90)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaCityChanseyText
call PrintText
ld a, CHANSEY
@@ -86,7 +86,7 @@
db "@"
FuchsiaCityText20: ; 19aa4 (6:5aa4)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaCityVoltorbText
call PrintText
ld a, VOLTORB
@@ -98,7 +98,7 @@
db "@"
FuchsiaCityText21: ; 19ab8 (6:5ab8)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaCityKangaskhanText
call PrintText
ld a, KANGASKHAN
@@ -110,7 +110,7 @@
db "@"
FuchsiaCityText22: ; 19acc (6:5acc)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaCitySlowpokeText
call PrintText
ld a, SLOWPOKE
@@ -122,7 +122,7 @@
db "@"
FuchsiaCityText23: ; 19ae0 (6:5ae0)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaCityLaprasText
call PrintText
ld a, LAPRAS
@@ -134,7 +134,7 @@
db "@"
FuchsiaCityText24: ; 19af4 (6:5af4)
- db $08 ; asm
+ TX_ASM
ld a, [wd7f6]
bit 6, a
jr nz, .asm_3b4e8
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -145,7 +145,7 @@
db $ff
FuchsiaGymText1: ; 75534 (1d:5534)
- db $08 ; asm
+ TX_ASM
ld a, [wd792]
bit 1, a
jr z, .asm_181b6
@@ -209,7 +209,7 @@
db "@"
FuchsiaGymText2: ; 755a4 (1d:55a4)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -227,7 +227,7 @@
db "@"
FuchsiaGymText3: ; 755bd (1d:55bd)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -245,7 +245,7 @@
db "@"
FuchsiaGymText4: ; 755d6 (1d:55d6)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -263,7 +263,7 @@
db "@"
FuchsiaGymText5: ; 755ef (1d:55ef)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -281,7 +281,7 @@
db "@"
FuchsiaGymText6: ; 75608 (1d:5608)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -299,7 +299,7 @@
db "@"
FuchsiaGymText7: ; 75621 (1d:5621)
- db $08 ; asm
+ TX_ASM
ld hl, FuchsiaGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -317,7 +317,7 @@
db "@"
FuchsiaGymText8: ; 7563a (1d:563a)
- db $08 ; asm
+ TX_ASM
ld a, [wd792]
bit 1, a
ld hl, FuchsiaGymText_75653
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/fuchsiahouse2.asm
@@ -9,7 +9,7 @@
dw FuchsiaHouse2Text5
FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
- db $08 ; asm
+ TX_ASM
ld a, [wd78e]
bit 0, a
jr nz, .subtract
@@ -97,7 +97,7 @@
FuchsiaHouse2Text5: ; 75163 (1d:5163)
FuchsiaHouse2Text4: ; 75163 (1d:5163)
- db $08 ; asm
+ TX_ASM
ldh a, [$8c]
cp $4
ld hl, FuchsiaHouse2Text_7517b
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -5,7 +5,7 @@
dw FuchsiaHouse3Text1
FuchsiaHouse3Text1: ; 56181 (15:6181)
- db $08 ; asm
+ TX_ASM
ld a, [wd728]
bit 4, a
jr nz, .after
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -241,7 +241,7 @@
dw GaryText5
GaryText1: ; 760e0 (1d:60e0)
- db $08 ; asm
+ TX_ASM
ld a, [wd867]
bit 1, a
ld hl, GaryText_760f4
@@ -272,7 +272,7 @@
db "@"
GaryText3: ; 7610d (1d:610d)
- db $8
+ TX_ASM
ld a, [W_PLAYERSTARTER]
ld [wd11e], a
call GetMonName
--- a/scripts/lab2.asm
+++ b/scripts/lab2.asm
@@ -11,13 +11,13 @@
db "@"
Lab2Text2: ; 75c2f (1d:5c2f)
- db $8
+ TX_ASM
ld a, $7
ld [wWhichTrade], a
jr Lab2DoTrade
Lab2Text3: ; 75c37 (1d:5c37)
- db $8
+ TX_ASM
ld a, $8
ld [wWhichTrade], a
Lab2DoTrade: ; 75c3d (1d:5c3d)
--- a/scripts/lab3.asm
+++ b/scripts/lab3.asm
@@ -9,7 +9,7 @@
dw Lab3Text5
Lab3Text1: ; 75c94 (1d:5c94)
- db $08 ; asm
+ TX_ASM
ld a, [wd7a1]
bit 7, a
jr nz, .asm_e551a
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -48,7 +48,7 @@
db $00
Lab4Text1: ; 75d6c (1d:5d6c)
- db $8
+ TX_ASM
ld a, [wd7a3]
bit 0, a
jr nz, .asm_75d96
@@ -105,7 +105,7 @@
db "@"
Lab4Text2: ; 75dda (1d:5dda)
- db $08 ; asm
+ TX_ASM
ld a, $3
ld [wWhichTrade], a
predef DoInGameTradeDialogue
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -144,7 +144,7 @@
db $ff
LanceText1: ; 5a3a4 (16:63a4)
- db $08 ; asm
+ TX_ASM
ld hl, LanceTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -159,7 +159,7 @@
LanceAfterBattleText: ; 5a3b8 (16:63b8)
TX_FAR _LanceAfterBattleText
- db $8
+ TX_ASM
ld hl, wd866
set 6, [hl]
jp TextScriptEnd
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/lavenderhouse1.asm
@@ -11,7 +11,7 @@
dw LavenderHouse1Text6
LavenderHouse1Text1: ; 1d8b8 (7:58b8)
- db $08 ; asm
+ TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_72e5d
@@ -33,7 +33,7 @@
db "@"
LavenderHouse1Text2: ; 1d8db (7:58db)
- db $08 ; asm
+ TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_06470
@@ -56,7 +56,7 @@
LavenderHouse1Text3: ; 1d8fe (7:58fe)
TX_FAR _LavenderHouse1Text3
- db $8
+ TX_ASM
ld a, PSYDUCK
call PlayCry
jp TextScriptEnd
@@ -63,13 +63,13 @@
LavenderHouse1Text4: ; 1d90b (7:590b)
TX_FAR _LavenderHouse1Text4
- db $8
+ TX_ASM
ld a, NIDORINO
call PlayCry
jp TextScriptEnd
LavenderHouse1Text5: ; 1d918 (7:5918)
- db $08 ; asm
+ TX_ASM
ld a, [wd76c]
bit 0, a
jr nz, .asm_15ac2
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/lavenderhouse2.asm
@@ -8,13 +8,13 @@
LavenderHouse2Text1: ; 1d9b6 (7:59b6)
TX_FAR _LavenderHouse2Text1
- db $8
+ TX_ASM
ld a, CUBONE
call PlayCry
jp TextScriptEnd
LavenderHouse2Text2: ; 1d9c3 (7:59c3)
- db $08 ; asm
+ TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_65711
--- a/scripts/lavendermart.asm
+++ b/scripts/lavendermart.asm
@@ -11,7 +11,7 @@
db "@"
LavenderMartText3: ; 5c93a (17:493a)
- db $08 ; asm
+ TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_c88d4
--- a/scripts/lavendertown.asm
+++ b/scripts/lavendertown.asm
@@ -13,7 +13,7 @@
dw LavenderTownText9
LavenderTownText1: ; 44120 (11:4120)
- db $08 ; asm
+ TX_ASM
ld hl, LavenderTownText_4413c
call PrintText
call YesNoChoice
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -132,7 +132,7 @@
db $ff
LoreleiText1: ; 76262 (1d:6262)
- db $08 ; asm
+ TX_ASM
ld hl, LoreleiTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -80,7 +80,7 @@
db $ff
Mansion1Text1: ; 44341 (11:4341)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -98,7 +98,7 @@
db "@"
Mansion1Text4: ; 4435a (11:435a)
- db $8
+ TX_ASM
ld hl, MansionSwitchText
call PrintText
call YesNoChoice
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -77,7 +77,7 @@
db $ff
Mansion2Text1: ; 52064 (14:6064)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -104,7 +104,7 @@
Mansion3Text6: ; 52087 (14:6087)
Mansion2Text5: ; 52087 (14:6087)
- db $8
+ TX_ASM
ld hl, Mansion2Text_520c2
call PrintText
call YesNoChoice
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -113,13 +113,13 @@
db $ff
Mansion3Text1: ; 522af (14:62af)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Mansion3Text2: ; 522b9 (14:62b9)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -92,13 +92,13 @@
db $ff
Mansion4Text1: ; 52461 (14:6461)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Mansion4Text2: ; 5246b (14:646b)
- db $08 ; asm
+ TX_ASM
ld hl, Mansion4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@@ -95,43 +95,43 @@
db $ff
MtMoon1Text1: ; 49a52 (12:5a52)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text2: ; 49a5c (12:5a5c)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text3: ; 49a66 (12:5a66)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text4: ; 49a70 (12:5a70)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text5: ; 49a7a (12:5a7a)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text6: ; 49a84 (12:5a84)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
MtMoon1Text7: ; 49a8e (12:5a8e)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon1TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -211,7 +211,7 @@
db $ff
MtMoon3Text1: ; 49e79 (12:5e79)
- db $08 ; asm
+ TX_ASM
ld a, [wd7f6]
bit 1, a
jr z, .asm_49e8d
@@ -244,31 +244,31 @@
jp TextScriptEnd
MtMoon3Text2: ; 49ec1 (12:5ec1)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
MtMoon3Text3: ; 49ecb (12:5ecb)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
MtMoon3Text4: ; 49ed5 (12:5ed5)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
MtMoon3Text5: ; 49edf (12:5edf)
- db $08 ; asm
+ TX_ASM
ld hl, MtMoon3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
MtMoon3Text6: ; 49ee9 (12:5ee9)
- db $08 ; asm
+ TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f24
@@ -297,7 +297,7 @@
db "@"
MtMoon3Text7: ; 49f29 (12:5f29)
- db $08 ; asm
+ TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f64
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -22,7 +22,7 @@
db "@"
MtMoonPokecenterText4: ; 492ec (12:52ec)
- db $08 ; asm
+ TX_ASM
ld a, [wd7c6]
add a
jp c, .asm_49353
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -39,7 +39,7 @@
dw Museum1FText5
Museum1FText1: ; 5c135 (17:4135)
- db $8
+ TX_ASM
ld a, [W_YCOORD]
cp $4
jr nz, .asm_8774b
@@ -179,7 +179,7 @@
db "@"
Museum1FText2: ; 5c247 (17:4247)
- db $08 ; asm
+ TX_ASM
ld hl, Museum1FText_5c251
call PrintText
jp TextScriptEnd
@@ -189,7 +189,7 @@
db "@"
Museum1FText3: ; 5c256 (17:4256)
- db $08 ; asm
+ TX_ASM
ld a, [wd754]
bit 1, a
jr nz, .asm_5c285
@@ -231,7 +231,7 @@
db "@"
Museum1FText4: ; 5c2a3 (17:42a3)
- db $08 ; asm
+ TX_ASM
ld hl, Museum1FText_5c2ad
call PrintText
jp TextScriptEnd
@@ -241,7 +241,7 @@
db "@"
Museum1FText5: ; 5c2b2 (17:42b2)
- db $08 ; asm
+ TX_ASM
ld hl, Museum1FText_5c2bc
call PrintText
jp TextScriptEnd
--- a/scripts/namerater.asm
+++ b/scripts/namerater.asm
@@ -41,7 +41,7 @@
dw NameRaterText1
NameRaterText1: ; 1da56 (7:5a56)
- db $8
+ TX_ASM
call SaveScreenTilesToBuffer2
ld hl, NameRaterText_1dab3
call NameRaterScript_1da15
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -734,7 +734,7 @@
OaksLabText28: ; 1d0ce (7:50ce)
OaksLabText1: ; 1d0ce (7:50ce)
- db $08 ; asm
+ TX_ASM
ld a, [wd74b]
bit 0, a
jr nz, .asm_1d0de
@@ -767,7 +767,7 @@
OaksLabText29: ; 1d102 (7:5102)
OaksLabText2: ; 1d102 (7:5102)
- db $8
+ TX_ASM
ld a, STARTER2
ld [wWhichTrade], a
ld a, $3
@@ -778,7 +778,7 @@
OaksLabText30: ; 1d113 (7:5113)
OaksLabText3: ; 1d113 (7:5113)
- db $8
+ TX_ASM
ld a, STARTER3
ld [wWhichTrade], a
ld a, $4
@@ -789,7 +789,7 @@
OaksLabText31: ; 1d124 (7:5124)
OaksLabText4: ; 1d124 (7:5124)
- db $8
+ TX_ASM
ld a, STARTER1
ld [wWhichTrade], a
ld a, $2
@@ -938,7 +938,7 @@
OaksLabText32: ; 1d248 (7:5248)
OaksLabText5: ; 1d248 (7:5248)
- db $08 ; asm
+ TX_ASM
ld a, [wd747]
bit 6, a
jr nz, .asm_1d266
@@ -1054,7 +1054,7 @@
OaksLabText33: ; 1d322 (7:5322)
OaksLabText7: ; 1d322 (7:5322)
OaksLabText6: ; 1d322 (7:5322)
- db $08 ; asm
+ TX_ASM
ld hl, OaksLabText_1d32c
call PrintText
jp TextScriptEnd
@@ -1070,7 +1070,7 @@
OaksLabText36: ; 1d336 (7:5336)
OaksLabText9: ; 1d336 (7:5336)
- db $08 ; asm
+ TX_ASM
ld hl, OaksLabText_1d340
call PrintText
jp TextScriptEnd
@@ -1080,7 +1080,7 @@
db "@"
OaksLabText17: ; 1d345 (7:5345)
- db $8
+ TX_ASM
ld hl, OaksLabRivalWaitingText
call PrintText
jp TextScriptEnd
@@ -1090,7 +1090,7 @@
db "@"
OaksLabText18: ; 1d354 (7:5354)
- db $8
+ TX_ASM
ld hl, OaksLabChooseMonText
call PrintText
jp TextScriptEnd
@@ -1100,7 +1100,7 @@
db "@"
OaksLabText19: ; 1d363 (7:5363)
- db $8
+ TX_ASM
ld hl, OaksLabRivalInterjectionText
call PrintText
jp TextScriptEnd
@@ -1110,7 +1110,7 @@
db "@"
OaksLabText20: ; 1d372 (7:5372)
- db $8
+ TX_ASM
ld hl, OaksLabBePatientText
call PrintText
jp TextScriptEnd
@@ -1120,7 +1120,7 @@
db "@"
OaksLabText12: ; 1d381 (7:5381)
- db $8
+ TX_ASM
ld hl, OaksLabLeavingText
call PrintText
jp TextScriptEnd
@@ -1130,7 +1130,7 @@
db "@"
OaksLabText13: ; 1d390 (7:5390)
- db $8
+ TX_ASM
ld hl, OaksLabRivalPickingMonText
call PrintText
jp TextScriptEnd
@@ -1140,7 +1140,7 @@
db "@"
OaksLabText14: ; 1d39f (7:539f)
- db $8
+ TX_ASM
ld hl, OaksLabRivalReceivedMonText
call PrintText
jp TextScriptEnd
@@ -1150,7 +1150,7 @@
db $11, "@"
OaksLabText15: ; 1d3af (7:53af)
- db $8
+ TX_ASM
ld hl, OaksLabRivalChallengeText
call PrintText
jp TextScriptEnd
@@ -1168,7 +1168,7 @@
db "@"
OaksLabText16: ; 1d3c8 (7:53c8)
- db $8
+ TX_ASM
ld hl, OaksLabRivalToughenUpText
call PrintText
jp TextScriptEnd
@@ -1209,7 +1209,7 @@
OaksLabText37: ; 1d3fb (7:53fb)
OaksLabText11: ; 1d3fb (7:53fb)
OaksLabText10: ; 1d3fb (7:53fb)
- db $08 ; asm
+ TX_ASM
ld hl, OaksLabText_1d405
call PrintText
jp TextScriptEnd
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -194,7 +194,7 @@
db "@"
PewterCityText3: ; 193b1 (6:53b1)
- db $08 ; asm
+ TX_ASM
ld hl, PewterCityText_193f1
call PrintText
call YesNoChoice
@@ -240,7 +240,7 @@
db "@"
PewterCityText4: ; 19405 (6:5405)
- db $8
+ TX_ASM
ld hl, PewterCityText_19427
call PrintText
call YesNoChoice
@@ -269,7 +269,7 @@
db "@"
PewterCityText5: ; 19436 (6:5436)
- db $08 ; asm
+ TX_ASM
ld hl, PewterCityText_1945d
call PrintText
xor a
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -105,7 +105,7 @@
db $ff
PewterGymText1: ; 5c44e (17:444e)
- db $08 ; asm
+ TX_ASM
ld a, [wd755]
bit 7, a
jr z, .asm_5c46a
@@ -170,7 +170,7 @@
db "@"
PewterGymText2: ; 5c4c6 (17:44c6)
- db $08 ; asm
+ TX_ASM
ld hl, PewterGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -188,7 +188,7 @@
db "@"
PewterGymText3: ; 5c4df (17:44df)
- db $08 ; asm
+ TX_ASM
ld a, [wd72a]
bit 0, a
jr nz, .asm_5c50c
--- a/scripts/pewterhouse1.asm
+++ b/scripts/pewterhouse1.asm
@@ -8,7 +8,7 @@
PewterHouse1Text1: ; 1d5fc (7:55fc)
TX_FAR _PewterHouse1Text1
- db $08 ; asm
+ TX_ASM
ld a, NIDORAN_M
call PlayCry
call WaitForSoundToFinish
--- a/scripts/pewtermart.asm
+++ b/scripts/pewtermart.asm
@@ -10,7 +10,7 @@
dw PewterMartText3
PewterMartText2: ; 74cbc (1d:4cbc)
- db $08 ; asm
+ TX_ASM
ld hl, PewterMartText_74cc6
call PrintText
jp TextScriptEnd
@@ -20,7 +20,7 @@
db "@"
PewterMartText3: ; 74ccb (1d:4ccb)
- db $08 ; asm
+ TX_ASM
ld hl, PewterMartText_74cd5
call PrintText
jp TextScriptEnd
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -16,7 +16,7 @@
db "@"
PewterPokecenterText3: ; 5c59b (17:459b)
- db $8
+ TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, PewterPokecenterText5
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -115,7 +115,7 @@
dw PokemonTower2Text2
PokemonTower2Text1: ; 605df (18:45df)
- db $08 ; asm
+ TX_ASM
ld a, [wd764]
bit 7, a
jr z, .asm_16f24
--- a/scripts/pokemontower3.asm
+++ b/scripts/pokemontower3.asm
@@ -48,19 +48,19 @@
db $ff
PokemonTower3Text1: ; 60712 (18:4712)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower3Text2: ; 6071c (18:471c)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower3TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower3Text3: ; 60726 (18:4726)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/pokemontower4.asm
+++ b/scripts/pokemontower4.asm
@@ -51,19 +51,19 @@
db $ff
PokemonTower4Text1: ; 60840 (18:4840)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower4Text2: ; 6084a (18:484a)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower4TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower4Text3: ; 60854 (18:4854)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -104,7 +104,7 @@
db "@"
PokemonTower5Text2: ; 609df (18:49df)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -122,7 +122,7 @@
db "@"
PokemonTower5Text3: ; 609f8 (18:49f8)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower5TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -140,7 +140,7 @@
db "@"
PokemonTower5Text4: ; 60a11 (18:4a11)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -158,7 +158,7 @@
db "@"
PokemonTower5Text5: ; 60a2a (18:4a2a)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -136,25 +136,25 @@
db $ff
PokemonTower6Text1: ; 60be4 (18:4be4)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower6TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower6Text2: ; 60bee (18:4bee)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower6TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower6Text3: ; 60bf8 (18:4bf8)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower6TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
PokemonTower6Text7: ; 60c02 (18:4c02)
- db $8
+ TX_ASM
ld hl, PokemonTower2Text_60c1f
call PrintText
ld a, MAROWAK
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -197,19 +197,19 @@
db $ff
PokemonTower7Text1: ; 60e6c (18:4e6c)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower7TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower7Text2: ; 60e76 (18:4e76)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower7TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower7Text3: ; 60e80 (18:4e80)
- db $08 ; asm
+ TX_ASM
ld hl, PokemonTower7TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -119,47 +119,47 @@
jp TextScriptEnd
PowerPlantText1: ; 1e374 (7:6374)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader0
jr InitVoltorbBattle
PowerPlantText2: ; 1e37a (7:637a)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader1
jr InitVoltorbBattle
PowerPlantText3: ; 1e380 (7:6380)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader2
jr InitVoltorbBattle
PowerPlantText4: ; 1e386 (7:6386)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader3
jr InitVoltorbBattle
PowerPlantText5: ; 1e38c (7:638c)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader4
jr InitVoltorbBattle
PowerPlantText6: ; 1e392 (7:6392)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader5
jr InitVoltorbBattle
PowerPlantText7: ; 1e398 (7:6398)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader6
jr InitVoltorbBattle
PowerPlantText8: ; 1e39e (7:639e)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader7
jr InitVoltorbBattle
PowerPlantText9: ; 1e3a4 (7:63a4)
- db $8 ; asm
+ TX_ASM
ld hl, PowerPlantTrainerHeader8
jr InitVoltorbBattle
@@ -169,7 +169,7 @@
ZapdosBattleText: ; 1e3af (7:63af)
TX_FAR _ZapdosBattleText
- db $8
+ TX_ASM
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@@ -95,31 +95,31 @@
db $ff
RocketHideout1Text1: ; 44c5f (11:4c5f)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text2: ; 44c69 (11:4c69)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout1TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text3: ; 44c73 (11:4c73)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout1TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text4: ; 44c7d (11:4c7d)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout1TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text5: ; 44c87 (11:4c87)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout1TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -126,7 +126,7 @@
RocketHideout1EndBattleText6: ; 44c91 (11:4c91)
TX_FAR _RocketHideout1EndBattleText6
- db $8
+ TX_ASM
ld hl, wd815
set 5, [hl]
ld hl, RocketHideout1Text_44c9f
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -437,7 +437,7 @@
db $ff
RocketHideout2Text1: ; 450de (11:50de)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -175,7 +175,7 @@
db $ff
RocketHideout3Text1: ; 4531b (11:531b)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -193,7 +193,7 @@
db "@"
RocketHideout3Text2: ; 45334 (11:5334)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -119,7 +119,7 @@
db $ff
RocketHideout4Text1: ; 4553a (11:553a)
- db $08 ; asm
+ TX_ASM
ld a, [wd81b]
bit 7, a
jp nz, .asm_545571
@@ -160,7 +160,7 @@
db "@"
RocketHideout4Text2: ; 45589 (11:5589)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -178,7 +178,7 @@
db "@"
RocketHideout4Text3: ; 455a2 (11:55a2)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -196,7 +196,7 @@
db "@"
RocketHideout4Text4: ; 455bb (11:55bb)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout4TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -210,7 +210,7 @@
db "@"
RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
- db $8
+ TX_ASM
ld hl, RocketHideout4Text_455ec
call PrintText
ld hl, wd81b
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -62,7 +62,7 @@
dw RocketHideoutElevatorText1
RocketHideoutElevatorText1: ; 4576d (11:576d)
- db $08 ; asm
+ TX_ASM
ld b, LIFT_KEY
call IsItemInBag
jr z, .asm_45782
--- a/scripts/rocktunnel1.asm
+++ b/scripts/rocktunnel1.asm
@@ -89,37 +89,37 @@
db $ff
RockTunnel1Text1: ; 4455a (11:455a)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader1
jr RockTunnel1TalkToTrainer
RockTunnel1Text2: ; 44560 (11:4560)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader2
jr RockTunnel1TalkToTrainer
RockTunnel1Text3: ; 44566 (11:4566)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader3
jr RockTunnel1TalkToTrainer
RockTunnel1Text4: ; 4456c (11:456c)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader4
jr RockTunnel1TalkToTrainer
RockTunnel1Text5: ; 44572 (11:4572)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader5
jr RockTunnel1TalkToTrainer
RockTunnel1Text6: ; 44578 (11:4578)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader6
jr RockTunnel1TalkToTrainer
RockTunnel1Text7: ; 4457e (11:457e)
- db $8
+ TX_ASM
ld hl, RockTunnel1TrainerHeader7
RockTunnel1TalkToTrainer: ; 44582 (11:4582)
call TalkToTrainer
--- a/scripts/rocktunnel2.asm
+++ b/scripts/rocktunnel2.asm
@@ -98,49 +98,49 @@
db $ff
RockTunnel2Text1: ; 46075 (11:6075)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text2: ; 4607f (11:607f)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text3: ; 46089 (11:6089)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text4: ; 46093 (11:6093)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text5: ; 4609d (11:609d)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text6: ; 460a7 (11:60a7)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text7: ; 460b1 (11:60b1)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
RockTunnel2Text8: ; 460bb (11:60bb)
- db $08 ; asm
+ TX_ASM
ld hl, RockTunnel2TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route1.asm
+++ b/scripts/route1.asm
@@ -7,7 +7,7 @@
dw Route1Text3
Route1Text1: ; 1cab8 (7:4ab8)
- db $08 ; asm
+ TX_ASM
ld hl, wd7bf
bit 0, [hl]
set 0, [hl]
--- a/scripts/route10.asm
+++ b/scripts/route10.asm
@@ -82,7 +82,7 @@
db $ff
Route10Text1: ; 593ac (16:53ac)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -100,7 +100,7 @@
db "@"
Route10Text2: ; 593c5 (16:53c5)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -118,7 +118,7 @@
db "@"
Route10Text3: ; 593de (16:53de)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -136,7 +136,7 @@
db "@"
Route10Text4: ; 593f7 (16:53f7)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -154,7 +154,7 @@
db "@"
Route10Text5: ; 59410 (16:5410)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -172,7 +172,7 @@
db "@"
Route10Text6: ; 59429 (16:5429)
- db $08 ; asm
+ TX_ASM
ld hl, Route10TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route11.asm
+++ b/scripts/route11.asm
@@ -119,7 +119,7 @@
db $ff
Route11Text1: ; 594f4 (16:54f4)
- db $8
+ TX_ASM
ld hl, Route11TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -137,7 +137,7 @@
db "@"
Route11Text2: ; 5950d (16:550d)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -155,7 +155,7 @@
db "@"
Route11Text3: ; 59526 (16:5526)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -173,7 +173,7 @@
db "@"
Route11Text4: ; 5953f (16:553f)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -191,7 +191,7 @@
db "@"
Route11Text5: ; 59558 (16:5558)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -209,7 +209,7 @@
db "@"
Route11Text6: ; 59571 (16:5571)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -227,7 +227,7 @@
db "@"
Route11Text7: ; 5958a (16:558a)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -245,7 +245,7 @@
db "@"
Route11Text8: ; 595a3 (16:55a3)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -263,7 +263,7 @@
db "@"
Route11Text9: ; 595bc (16:55bc)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@@ -281,7 +281,7 @@
db "@"
Route11Text10: ; 595d5 (16:55d5)
- db $08 ; asm
+ TX_ASM
ld hl, Route11TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -8,7 +8,7 @@
dw Route11GateUpstairsText4
Route11GateUpstairsText1: ; 4945f (12:545f)
- db $08 ; asm
+ TX_ASM
xor a
ld [wWhichTrade], a
predef DoInGameTradeDialogue
@@ -16,7 +16,7 @@
jp TextScriptEnd
Route11GateUpstairsText2: ; 4946c (12:546c)
- db $8
+ TX_ASM
ld a, [wd7d6]
add a
jr c, .asm_4949b
@@ -48,7 +48,7 @@
db "@"
Route11GateUpstairsText3: ; 494a8 (12:54a8)
- db $08 ; asm
+ TX_ASM
ld a, [wSpriteStateData1 + 9]
cp $4
jp nz, Route12GateUpstairsScript_495c9
@@ -70,7 +70,7 @@
db "@"
Route11GateUpstairsText4: ; 494ce (12:54ce)
- db $8
+ TX_ASM
ld hl, Route11GateUpstairsText_494d5
jp Route12GateUpstairsScript_495c9
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -157,7 +157,7 @@
db "@"
Route12Text2: ; 596f5 (16:56f5)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -175,7 +175,7 @@
db "@"
Route12Text3: ; 5970e (16:570e)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -193,7 +193,7 @@
db "@"
Route12Text4: ; 59727 (16:5727)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -211,7 +211,7 @@
db "@"
Route12Text5: ; 59740 (16:5740)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -229,7 +229,7 @@
db "@"
Route12Text6: ; 59759 (16:5759)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -247,7 +247,7 @@
db "@"
Route12Text7: ; 59772 (16:5772)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -265,7 +265,7 @@
db "@"
Route12Text8: ; 5978b (16:578b)
- db $08 ; asm
+ TX_ASM
ld hl, Route12TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/route12gateupstairs.asm
@@ -7,7 +7,7 @@
dw Route12GateUpstairsText3
Route12GateUpstairsText1: ; 49569 (12:5569)
- db $08 ; asm
+ TX_ASM
ld a, [wd7d7]
rrca
jr c, .asm_0ad3c
@@ -48,7 +48,7 @@
db "@"
Route12GateUpstairsText2: ; 495b1 (12:55b1)
- db $08 ; asm
+ TX_ASM
ld hl, Route12GateUpstairsText_495b8
jp Route12GateUpstairsScript_495c9
@@ -57,7 +57,7 @@
db "@"
Route12GateUpstairsText3: ; 495bd (12:55bd)
- db $8
+ TX_ASM
ld hl, Route12GateUpstairsText_495c4
jp Route12GateUpstairsScript_495c9
--- a/scripts/route12house.asm
+++ b/scripts/route12house.asm
@@ -5,7 +5,7 @@
dw Route12HouseText1
Route12HouseText1: ; 56484 (15:6484)
- db $08 ; asm
+ TX_ASM
ld a, [wd728]
bit 5, a
jr nz, .asm_b4cad
--- a/scripts/route13.asm
+++ b/scripts/route13.asm
@@ -121,7 +121,7 @@
db $ff
Route13Text1: ; 558ca (15:58ca)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -139,7 +139,7 @@
db "@"
Route13Text2: ; 558e3 (15:58e3)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -157,7 +157,7 @@
db "@"
Route13Text3: ; 558fc (15:58fc)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -175,7 +175,7 @@
db "@"
Route13Text4: ; 55915 (15:5915)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -193,7 +193,7 @@
db "@"
Route13Text5: ; 5592e (15:592e)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -211,7 +211,7 @@
db "@"
Route13Text6: ; 55947 (15:5947)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -229,7 +229,7 @@
db "@"
Route13Text7: ; 55960 (15:5960)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -247,7 +247,7 @@
db "@"
Route13Text8: ; 55979 (15:5979)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@@ -265,7 +265,7 @@
db "@"
Route13Text9: ; 55992 (15:5992)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
@@ -283,7 +283,7 @@
db "@"
Route13Text10: ; 559ab (15:59ab)
- db $08 ; asm
+ TX_ASM
ld hl, Route13TrainerHeader10
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route14.asm
+++ b/scripts/route14.asm
@@ -119,7 +119,7 @@
db $ff
Route14Text1: ; 55a7b (15:5a7b)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -137,7 +137,7 @@
db "@"
Route14Text2: ; 55a94 (15:5a94)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -155,7 +155,7 @@
db "@"
Route14Text3: ; 55aad (15:5aad)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -173,7 +173,7 @@
db "@"
Route14Text4: ; 55ac6 (15:5ac6)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -191,7 +191,7 @@
db "@"
Route14Text5: ; 55adf (15:5adf)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -209,7 +209,7 @@
db "@"
Route14Text6: ; 55af8 (15:5af8)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -227,7 +227,7 @@
db "@"
Route14Text7: ; 55b11 (15:5b11)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -245,7 +245,7 @@
db "@"
Route14Text8: ; 55b2a (15:5b2a)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -263,7 +263,7 @@
db "@"
Route14Text9: ; 55b43 (15:5b43)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@@ -281,7 +281,7 @@
db "@"
Route14Text10: ; 55b5c (15:5b5c)
- db $08 ; asm
+ TX_ASM
ld hl, Route14TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@@ -120,52 +120,52 @@
db $ff
Route15Text1: ; 59858 (16:5858)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader0
jr Route15TalkToTrainer
Route15Text2: ; 5985e (16:585e)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader1
jr Route15TalkToTrainer
Route15Text3: ; 59864 (16:5864)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader2
jr Route15TalkToTrainer
Route15Text4: ; 5986a (16:586a)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader3
jr Route15TalkToTrainer
Route15Text5: ; 59870 (16:5870)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader4
jr Route15TalkToTrainer
Route15Text6: ; 59876 (16:5876)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader5
jr Route15TalkToTrainer
Route15Text7: ; 5987c (16:587c)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader6
jr Route15TalkToTrainer
Route15Text8: ; 59882 (16:5882)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader7
jr Route15TalkToTrainer
Route15Text9: ; 59888 (16:5888)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader8
jr Route15TalkToTrainer
Route15Text10: ; 5988e (16:588e)
- db $8 ; asm
+ TX_ASM
ld hl, Route15TrainerHeader9
Route15TalkToTrainer: ; 59892 (16:5892)
call TalkToTrainer
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@@ -6,7 +6,7 @@
dw Route15GateUpstairsText2
Route15GateUpstairsText1: ; 49651 (12:5651)
- db $8
+ TX_ASM
ld a, [wd7dd]
bit 0, a
jr nz, .asm_49683
@@ -37,7 +37,7 @@
db "@"
Route15GateUpstairsText2: ; 49691 (12:5691)
- db $8
+ TX_ASM
ld hl, Route15GateUpstairsText_49698
jp Route12GateUpstairsScript_495c9
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -134,7 +134,7 @@
db $ff
Route16Text1: ; 59a18 (16:5a18)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -152,7 +152,7 @@
db "@"
Route16Text2: ; 59a31 (16:5a31)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -170,7 +170,7 @@
db "@"
Route16Text3: ; 59a4a (16:5a4a)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -188,7 +188,7 @@
db "@"
Route16Text4: ; 59a63 (16:5a63)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -206,7 +206,7 @@
db "@"
Route16Text5: ; 59a7c (16:5a7c)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -224,7 +224,7 @@
db "@"
Route16Text6: ; 59a95 (16:5a95)
- db $08 ; asm
+ TX_ASM
ld hl, Route16TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route16gate.asm
+++ b/scripts/route16gate.asm
@@ -92,7 +92,7 @@
dw Route16GateText3
Route16GateText1: ; 49760 (12:5760)
- db $08 ; asm
+ TX_ASM
call Route16GateScript_49755
jr z, .asm_0bdf3
ld hl, Route16GateText_4977c
--- a/scripts/route16gateupstairs.asm
+++ b/scripts/route16gateupstairs.asm
@@ -8,7 +8,7 @@
dw Route16GateUpstairsText4
Route16GateUpstairsText1: ; 49816 (12:5816)
- db $08 ; asm
+ TX_ASM
ld hl, Route16GateUpstairsText_49820
call PrintText
jp TextScriptEnd
@@ -18,7 +18,7 @@
db "@"
Route16GateUpstairsText2: ; 49825 (12:5825)
- db $08 ; asm
+ TX_ASM
ld hl, Route16GateUpstairsText_4982f
call PrintText
jp TextScriptEnd
@@ -28,7 +28,7 @@
db "@"
Route16GateUpstairsText3: ; 49834 (12:5834)
- db $8
+ TX_ASM
ld hl, Route16GateUpstairsText_4983b
jp Route12GateUpstairsScript_495c9
@@ -37,7 +37,7 @@
db "@"
Route16GateUpstairsText4: ; 49840 (12:5840)
- db $8
+ TX_ASM
ld hl, Route16GateUpstairsText_49847
jp Route12GateUpstairsScript_495c9
--- a/scripts/route16house.asm
+++ b/scripts/route16house.asm
@@ -6,7 +6,7 @@
dw Route16HouseText2
Route16HouseText1: ; 1e5ff (7:65ff)
- db $08 ; asm
+ TX_ASM
ld a, [wd7e0]
bit 6, a
ld hl, HM02ExplanationText
@@ -43,7 +43,7 @@
db "@"
Route16HouseText2: ; 1e640 (7:6640)
- db $08 ; asm
+ TX_ASM
ld hl, Route16HouseText_1e652
call PrintText
ld a, FEAROW
--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@@ -124,7 +124,7 @@
db $ff
Route17Text1: ; 55c2c (15:5c2c)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -142,7 +142,7 @@
db "@"
Route17Text2: ; 55c45 (15:5c45)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -160,7 +160,7 @@
db "@"
Route17Text3: ; 55c5e (15:5c5e)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -178,7 +178,7 @@
db "@"
Route17Text4: ; 55c77 (15:5c77)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -196,7 +196,7 @@
db "@"
Route17Text5: ; 55c90 (15:5c90)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -214,7 +214,7 @@
db "@"
Route17Text6: ; 55ca9 (15:5ca9)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -232,7 +232,7 @@
db "@"
Route17Text7: ; 55cc2 (15:5cc2)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -250,7 +250,7 @@
db "@"
Route17Text8: ; 55cdb (15:5cdb)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -268,7 +268,7 @@
db "@"
Route17Text9: ; 55cf4 (15:5cf4)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@@ -286,7 +286,7 @@
db "@"
Route17Text10: ; 55d0d (15:5d0d)
- db $08 ; asm
+ TX_ASM
ld hl, Route17TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route18.asm
+++ b/scripts/route18.asm
@@ -50,7 +50,7 @@
db $ff
Route18Text1: ; 59b0f (16:5b0f)
- db $08 ; asm
+ TX_ASM
ld hl, Route18TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -68,7 +68,7 @@
db "@"
Route18Text2: ; 59b28 (16:5b28)
- db $08 ; asm
+ TX_ASM
ld hl, Route18TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -86,7 +86,7 @@
db "@"
Route18Text3: ; 59b41 (16:5b41)
- db $08 ; asm
+ TX_ASM
ld hl, Route18TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route18gate.asm
+++ b/scripts/route18gate.asm
@@ -87,7 +87,7 @@
dw Route18GateText2
Route18GateText1: ; 49911 (12:5911)
- db $08 ; asm
+ TX_ASM
call Route16GateScript_49755
jr z, .asm_3c84d
ld hl, Route18GateText_4992d
--- a/scripts/route18gateupstairs.asm
+++ b/scripts/route18gateupstairs.asm
@@ -7,7 +7,7 @@
dw Route18GateUpstairsText3
Route18GateUpstairsText1: ; 4997e (12:597e)
- db $08 ; asm
+ TX_ASM
ld a, $5
ld [wWhichTrade], a
predef DoInGameTradeDialogue
@@ -14,7 +14,7 @@
jp TextScriptEnd
Route18GateUpstairsText2: ; 4998c (12:598c)
- db $8
+ TX_ASM
ld hl, Route18GateUpstairsText_49993
jp Route12GateUpstairsScript_495c9
@@ -23,7 +23,7 @@
db "@"
Route18GateUpstairsText3: ; 49998 (12:5998)
- db $8
+ TX_ASM
ld hl, Route18GateUpstairsText_4999f
jp Route12GateUpstairsScript_495c9
--- a/scripts/route19.asm
+++ b/scripts/route19.asm
@@ -119,61 +119,61 @@
db $ff
Route19Text1: ; 55dec (15:5dec)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route19Text2: ; 55df6 (15:5df6)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
Route19Text3: ; 55e00 (15:5e00)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route19Text4: ; 55e0a (15:5e0a)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route19Text5: ; 55e14 (15:5e14)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route19Text6: ; 55e1e (15:5e1e)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route19Text7: ; 55e28 (15:5e28)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
Route19Text8: ; 55e32 (15:5e32)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
Route19Text9: ; 55e3c (15:5e3c)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
Route19Text10: ; 55e46 (15:5e46)
- db $08 ; asm
+ TX_ASM
ld hl, Route19TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -175,61 +175,61 @@
db $ff
Route20Text1: ; 50db3 (14:4db3)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route20Text2: ; 50dbd (14:4dbd)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route20Text3: ; 50dc7 (14:4dc7)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route20Text4: ; 50dd1 (14:4dd1)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route20Text5: ; 50ddb (14:4ddb)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route20Text6: ; 50de5 (14:4de5)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
Route20Text7: ; 50def (14:4def)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
Route20Text8: ; 50df9 (14:4df9)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
Route20Text9: ; 50e03 (14:4e03)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
Route20Text10: ; 50e0d (14:4e0d)
- db $08 ; asm
+ TX_ASM
ld hl, Route20TrainerHeader10
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@@ -108,55 +108,55 @@
db $ff
Route21Text1: ; 55f83 (15:5f83)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route21Text2: ; 55f8d (15:5f8d)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
Route21Text3: ; 55f97 (15:5f97)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route21Text4: ; 55fa1 (15:5fa1)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route21Text5: ; 55fab (15:5fab)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route21Text6: ; 55fb5 (15:5fb5)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route21Text7: ; 55fbf (15:5fbf)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
Route21Text8: ; 55fc9 (15:5fc9)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
Route21Text9: ; 55fd3 (15:5fd3)
- db $08 ; asm
+ TX_ASM
ld hl, Route21TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -367,7 +367,7 @@
dw Route22FrontGateText
Route22Text1: ; 5117b (14:517b)
- db $08 ; asm
+ TX_ASM
ld a, [wd7eb]
bit 5, a
jr z, .asm_5118b
@@ -381,7 +381,7 @@
jp TextScriptEnd
Route22Text2: ; 51194 (14:5194)
- db $08 ; asm
+ TX_ASM
ld a, [wd7eb]
bit 6, a
jr z, .asm_511a4
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -57,7 +57,7 @@
dw Route22GateText1
Route22GateText1: ; 1e6e1 (7:66e1)
- db $8
+ TX_ASM
ld a, [W_OBTAINEDBADGES]
bit 0, a
jr nz, .asm_1e6f6
@@ -76,7 +76,7 @@
Route22GateText_1e704: ; 1e704 (7:6704)
TX_FAR _Route22GateText_1e704
- db $8
+ TX_ASM
ld a, (SFX_02_51 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
call WaitForSoundToFinish
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -146,43 +146,43 @@
dw Route23Text8
Route23Text1: ; 51307 (14:5307)
- db $08 ; asm
+ TX_ASM
ld a, $6
call Route23Script_51346
jp TextScriptEnd
Route23Text2: ; 51310 (14:5310)
- db $08 ; asm
+ TX_ASM
ld a, $5
call Route23Script_51346
jp TextScriptEnd
Route23Text3: ; 51319 (14:5319)
- db $08 ; asm
+ TX_ASM
ld a, $4
call Route23Script_51346
jp TextScriptEnd
Route23Text4: ; 51322 (14:5322)
- db $08 ; asm
+ TX_ASM
ld a, $3
call Route23Script_51346
jp TextScriptEnd
Route23Text5: ; 5132b (14:532b)
- db $08 ; asm
+ TX_ASM
ld a, $2
call Route23Script_51346
jp TextScriptEnd
Route23Text6: ; 51334 (14:5334)
- db $08 ; asm
+ TX_ASM
ld a, $1
call Route23Script_51346
jp TextScriptEnd
Route23Text7: ; 5133d (14:533d)
- db $8
+ TX_ASM
ld a, $0
call Route23Script_51346
jp TextScriptEnd
@@ -223,7 +223,7 @@
VictoryRoadGuardText1: ; 5138e (14:538e)
TX_FAR _VictoryRoadGuardText1
- db $08 ; asm
+ TX_ASM
ld a, (SFX_02_51 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
call WaitForSoundToFinish
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@@ -147,7 +147,7 @@
db $ff
Route24Text1: ; 514a4 (14:54a4)
- db $8
+ TX_ASM
ld hl, wd7f0
res 1, [hl]
ld a, [wd7ef]
@@ -218,37 +218,37 @@
db "@"
Route24Text2: ; 51535 (14:5535)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route24Text3: ; 5153f (14:553f)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route24Text4: ; 51549 (14:5549)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route24Text5: ; 51553 (14:5553)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route24Text6: ; 5155d (14:555d)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route24Text7: ; 51567 (14:5567)
- db $08 ; asm
+ TX_ASM
ld hl, Route24TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -139,55 +139,55 @@
db $ff
Route25Text1: ; 516ab (14:56ab)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route25Text2: ; 516b5 (14:56b5)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route25Text3: ; 516bf (14:56bf)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route25Text4: ; 516c9 (14:56c9)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route25Text5: ; 516d3 (14:56d3)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route25Text6: ; 516dd (14:56dd)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
Route25Text7: ; 516e7 (14:56e7)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
Route25Text8: ; 516f1 (14:56f1)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
Route25Text9: ; 516fb (14:56fb)
- db $08 ; asm
+ TX_ASM
ld hl, Route25TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route2gate.asm
+++ b/scripts/route2gate.asm
@@ -6,7 +6,7 @@
dw Route2GateText2
Route2GateText1: ; 5d5db (17:55db)
- db $08 ; asm
+ TX_ASM
ld a, [wd7c2]
bit 0, a
jr nz, .asm_5d60d
--- a/scripts/route2house.asm
+++ b/scripts/route2house.asm
@@ -10,7 +10,7 @@
db "@"
Route2HouseText2: ; 1def9 (7:5ef9)
- db $08 ; asm
+ TX_ASM
ld a, $1
ld [wWhichTrade], a
predef DoInGameTradeDialogue
--- a/scripts/route3.asm
+++ b/scripts/route3.asm
@@ -104,7 +104,7 @@
db "@"
Route3Text2: ; 5558b (15:558b)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -122,7 +122,7 @@
db "@"
Route3Text3: ; 555a4 (15:55a4)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -140,7 +140,7 @@
db "@"
Route3Text4: ; 555bd (15:55bd)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -158,7 +158,7 @@
db "@"
Route3Text5: ; 555d6 (15:55d6)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -176,7 +176,7 @@
db "@"
Route3Text6: ; 555ef (15:55ef)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -194,7 +194,7 @@
db "@"
Route3Text7: ; 55608 (15:5608)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -212,7 +212,7 @@
db "@"
Route3Text8: ; 55621 (15:5621)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -230,7 +230,7 @@
db "@"
Route3Text9: ; 5563a (15:563a)
- db $08 ; asm
+ TX_ASM
ld hl, Route3TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route4.asm
+++ b/scripts/route4.asm
@@ -37,7 +37,7 @@
db "@"
Route4Text2: ; 5568f (15:568f)
- db $08 ; asm
+ TX_ASM
ld hl, Route4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route5gate.asm
+++ b/scripts/route5gate.asm
@@ -69,7 +69,7 @@
Route7GateText1: ; 1dfaa (7:5faa)
Route6GateText1: ; 1dfaa (7:5faa)
Route5GateText1: ; 1dfaa (7:5faa)
- db $8
+ TX_ASM
ld a, [wd728]
bit 6, a
jr nz, .asm_88856
--- a/scripts/route6.asm
+++ b/scripts/route6.asm
@@ -79,7 +79,7 @@
db $ff
Route6Text1: ; 59120 (16:5120)
- db $8
+ TX_ASM
ld hl, Route6TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -97,7 +97,7 @@
db "@"
Route6Text2: ; 59139 (16:5139)
- db $08 ; asm
+ TX_ASM
ld hl, Route6TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -111,7 +111,7 @@
db "@"
Route6Text3: ; 5914d (16:514d)
- db $08 ; asm
+ TX_ASM
ld hl, Route6TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -129,7 +129,7 @@
db "@"
Route6Text4: ; 59166 (16:5166)
- db $08 ; asm
+ TX_ASM
ld hl, Route6TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -147,7 +147,7 @@
db "@"
Route6Text5: ; 5917f (16:517f)
- db $08 ; asm
+ TX_ASM
ld hl, Route6TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -165,7 +165,7 @@
db "@"
Route6Text6: ; 59198 (16:5198)
- db $08 ; asm
+ TX_ASM
ld hl, Route6TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@@ -109,7 +109,7 @@
db $ff
Route8Text1: ; 59250 (16:5250)
- db $8
+ TX_ASM
ld hl, Route8TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -127,7 +127,7 @@
db "@"
Route8Text2: ; 59269 (16:5269)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -145,7 +145,7 @@
db "@"
Route8Text3: ; 59282 (16:5282)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -163,7 +163,7 @@
db "@"
Route8Text4: ; 5929b (16:529b)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -181,7 +181,7 @@
db "@"
Route8Text5: ; 592b4 (16:52b4)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -199,7 +199,7 @@
db "@"
Route8Text6: ; 592cd (16:52cd)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -217,7 +217,7 @@
db "@"
Route8Text7: ; 592e6 (16:52e6)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -235,7 +235,7 @@
db "@"
Route8Text8: ; 592ff (16:52ff)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -253,7 +253,7 @@
db "@"
Route8Text9: ; 59318 (16:5318)
- db $08 ; asm
+ TX_ASM
ld hl, Route8TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@@ -110,47 +110,47 @@
db $ff
Route9Text1: ; 55758 (15:5758)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader0
jr Route9TalkToTrainer
Route9Text2: ; 5575e (15:575e)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader2
jr Route9TalkToTrainer
Route9Text3: ; 55764 (15:5764)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader3
jr Route9TalkToTrainer
Route9Text4: ; 5576a (15:576a)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader4
jr Route9TalkToTrainer
Route9Text5: ; 55770 (15:5770)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader5
jr Route9TalkToTrainer
Route9Text6: ; 55776 (15:5776)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader6
jr Route9TalkToTrainer
Route9Text7: ; 5577c (15:577c)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader7
jr Route9TalkToTrainer
Route9Text8: ; 55782 (15:5782)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader8
jr Route9TalkToTrainer
Route9Text9: ; 55788 (15:5788)
- db $8 ; asm
+ TX_ASM
ld hl, Route9TrainerHeader9
Route9TalkToTrainer: ; 5578c (15:578c)
call TalkToTrainer
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -146,7 +146,7 @@
.SafariZoneEntranceText4
TX_FAR SafariZoneEntranceText_9e6e4
- db $8
+ TX_ASM
ld a, $13
ld [wTextBoxID],a
call DisplayTextBoxID
@@ -226,7 +226,7 @@
.SafariZoneEntranceText5
TX_FAR SafariZoneEntranceText_9e814
- db $8
+ TX_ASM
call YesNoChoice
ld a,[wCurrentMenuItem]
and a
@@ -272,7 +272,7 @@
db "@"
.SafariZoneEntranceText2
- db $08 ; asm
+ TX_ASM
ld hl,.FirstTimeQuestionText
call PrintText
call YesNoChoice
--- a/scripts/safarizonesecrethouse.asm
+++ b/scripts/safarizonesecrethouse.asm
@@ -5,7 +5,7 @@
dw SafariZoneSecretHouseText1
SafariZoneSecretHouseText1: ; 4a31c (12:631c)
- db $08 ; asm
+ TX_ASM
ld a, [wd857]
bit 0, a
jr nz, .asm_20a9b
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -157,7 +157,7 @@
db $ff
SaffronGymText1: ; 5d118 (17:5118)
- db $08 ; asm
+ TX_ASM
ld a, [wd7b3]
bit 1, a
jr z, .asm_5d134
@@ -219,49 +219,49 @@
db "@"
SaffronGymText2: ; 5d187 (17:5187)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SaffronGymText3: ; 5d191 (17:5191)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SaffronGymText4: ; 5d19b (17:519b)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SaffronGymText5: ; 5d1a5 (17:51a5)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SaffronGymText6: ; 5d1af (17:51af)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SaffronGymText7: ; 5d1b9 (17:51b9)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
SaffronGymText8: ; 5d1c3 (17:51c3)
- db $08 ; asm
+ TX_ASM
ld hl, SaffronGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
SaffronGymText9: ; 5d1cd (17:51cd)
- db $08 ; asm
+ TX_ASM
ld a, [wd7b3]
bit 1, a
jr nz, .asm_5d1dd
--- a/scripts/saffronhouse1.asm
+++ b/scripts/saffronhouse1.asm
@@ -13,7 +13,7 @@
SaffronHouse1Text2: ; 1dded (7:5ded)
TX_FAR _SaffronHouse1Text2
- db $8
+ TX_ASM
ld a, PIDGEY
call PlayCry
jp TextScriptEnd
--- a/scripts/saffronhouse2.asm
+++ b/scripts/saffronhouse2.asm
@@ -5,7 +5,7 @@
dw SaffronHouse2Text1
SaffronHouse2Text1: ; 1de41 (7:5e41)
- db $08 ; asm
+ TX_ASM
ld a, [wd7bd]
bit 0, a
jr nz, .asm_9e72b
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -154,7 +154,7 @@
db $ff
SeafoamIslands5Text3: ; 46893 (11:6893)
- db $08 ; asm
+ TX_ASM
ld hl, SeafoamIslands5TrainerHeader0
call TalkToTrainer
ld a, $4
@@ -163,7 +163,7 @@
SeafoamIslands5BattleText2: ; 468a2 (11:68a2)
TX_FAR _SeafoamIslands5BattleText2
- db $8
+ TX_ASM
ld a, ARTICUNO
call PlayCry
call WaitForSoundToFinish
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -70,19 +70,19 @@
db $ff
SilphCo10Text1: ; 5a1ab (16:61ab)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text2: ; 5a1b5 (16:61b5)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text3: ; 5a1bf (16:61bf)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SilphCo10Text_5a1d8
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -302,7 +302,7 @@
db $ff
SilphCo11Text1: ; 622dc (18:62dc)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 5, a
jp nz, .asm_62308
@@ -359,7 +359,7 @@
db "@"
SilphCo11Text4: ; 6233a (18:633a)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo11TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -377,7 +377,7 @@
db "@"
SilphCo11Text5: ; 62353 (18:6353)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo11TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -395,7 +395,7 @@
db "@"
SilphCo10Text_6236c: ; 6236c (18:636c)
- db $8
+ TX_ASM
ld hl, SilphCo10Text_6237b
call PrintText
ld a, PORYGON
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@@ -137,7 +137,7 @@
db $ff
SilphCo2Text1: ; 59dc1 (16:5dc1)
- db $08 ; asm
+ TX_ASM
ld a, [wd826]
bit 7, a
jr nz, .asm_59de4
@@ -174,25 +174,25 @@
db "@"
SilphCo2Text2: ; 59e02 (16:5e02)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo2Text3: ; 59e0c (16:5e0c)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo2TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo2Text4: ; 59e16 (16:5e16)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo2TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SilphCo2Text5: ; 59e20 (16:5e20)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo2TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -82,7 +82,7 @@
db $ff
SilphCo3Text1: ; 59fe5 (16:5fe5)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SilphCo3Text_59ffe
@@ -101,7 +101,7 @@
db "@"
SilphCo3Text2: ; 5a003 (16:6003)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -119,7 +119,7 @@
db "@"
SilphCo3Text3: ; 5a01c (16:601c)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo3TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@@ -130,7 +130,7 @@
db $ff
SilphCo4Text1: ; 19dd3 (6:5dd3)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo4Text_19de0
ld de, SilphCo4Text_19de5
call SilphCo6Script_1a22f
@@ -145,7 +145,7 @@
db "@"
SilphCo4Text2: ; 19dea (6:5dea)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -163,7 +163,7 @@
db "@"
SilphCo4Text3: ; 19e03 (6:5e03)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -181,7 +181,7 @@
db "@"
SilphCo4Text4: ; 19e1c (6:5e1c)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo4TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -121,7 +121,7 @@
db $ff
SilphCo5Text1: ; 1a003 (6:6003)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo5Text_1a010
ld de, SilphCo5Text_1a015
call SilphCo6Script_1a22f
@@ -136,7 +136,7 @@
db "@"
SilphCo5Text2: ; 1a01a (6:601a)
- db $08 ; asm
+ TX_ASM
ld hl, Silphco5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -154,7 +154,7 @@
db "@"
SilphCo5Text3: ; 1a033 (6:6033)
- db $08 ; asm
+ TX_ASM
ld hl, Silphco5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -172,7 +172,7 @@
db "@"
SilphCo5Text4: ; 1a04c (6:604c)
- db $08 ; asm
+ TX_ASM
ld hl, Silphco5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -190,7 +190,7 @@
db "@"
SilphCo5Text5: ; 1a065 (6:6065)
- db $08 ; asm
+ TX_ASM
ld hl, Silphco5TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@@ -95,7 +95,7 @@
jp PrintText
SilphCo6Text1: ; 1a23d (6:623d)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6Text_1a24a
ld de, SilphCo6Text_1a24f
call SilphCo6Script_1a22f
@@ -110,7 +110,7 @@
db "@"
SilphCo6Text2: ; 1a254 (6:6254)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6Text_1a261
ld de, SilphCo6Text_1a266
call SilphCo6Script_1a22f
@@ -125,7 +125,7 @@
db "@"
SilphCo6Text3: ; 1a26b (6:626b)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6Text_1a278
ld de, SilphCo6Text_1a27d
call SilphCo6Script_1a22f
@@ -140,7 +140,7 @@
db "@"
SilphCo6Text4: ; 1a282 (6:6282)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6Text_1a28f
ld de, SilphCo6Text_1a294
call SilphCo6Script_1a22f
@@ -155,7 +155,7 @@
db "@"
SilphCo6Text5: ; 1a299 (6:6299)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6Text_1a2a6
ld de, SilphCo6Text_1a2ab
call SilphCo6Script_1a22f
@@ -170,7 +170,7 @@
db "@"
SilphCo6Text6: ; 1a2b0 (6:62b0)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -188,7 +188,7 @@
db "@"
SilphCo6Text7: ; 1a2c9 (6:62c9)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -206,7 +206,7 @@
db "@"
SilphCo6Text8: ; 1a2e2 (6:62e2)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo6TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -307,7 +307,7 @@
SilphCo7Text1:
; lapras guy
- db $08 ; asm
+ TX_ASM
ld a, [wd72e]
bit 0, a ; got lapras?
jr z, .givelapras
@@ -355,7 +355,7 @@
db "@"
SilphCo7Text2:
- db $8
+ TX_ASM
ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
@@ -377,7 +377,7 @@
db "@"
SilphCo7Text3:
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
@@ -399,7 +399,7 @@
db "@"
SilphCo7Text4:
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
@@ -421,7 +421,7 @@
db "@"
SilphCo7Text5: ; 51e50 (14:5e50)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo7TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -439,7 +439,7 @@
db "@"
SilphCo7Text6: ; 51e69 (14:5e69)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo7TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -457,7 +457,7 @@
db "@"
SilphCo7Text7: ; 51e82 (14:5e82)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo7TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -475,7 +475,7 @@
db "@"
SilphCo7Text8: ; 51e9b (14:5e9b)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo7TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -493,7 +493,7 @@
db "@"
SilphCo7Text9: ; 51eb4 (14:5eb4)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo7Text_51ebe
call PrintText
jp TextScriptEnd
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -113,7 +113,7 @@
db $ff
SilphCo8Text1: ; 565aa (15:65aa)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SilphCo8Text_565c3
@@ -132,19 +132,19 @@
db "@"
SilphCo8Text2: ; 565c8 (15:65c8)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo8TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo8Text3: ; 565d2 (15:65d2)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo8TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo8Text4: ; 565dc (15:65dc)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo8TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -157,7 +157,7 @@
db $ff
SilphCo9Text1: ; 5d8b8 (17:58b8)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
jr nz, .asm_5d8dc
@@ -189,19 +189,19 @@
db "@"
SilphCo9Text2: ; 5d8f4 (17:58f4)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo9TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo9Text3: ; 5d8fe (17:58fe)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo9TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo9Text4: ; 5d908 (17:5908)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo9TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -70,7 +70,7 @@
dw SilphCoElevatorText1
SilphCoElevatorText1: ; 45835 (11:5835)
- db $08 ; asm
+ TX_ASM
call SilphCoElevatorScript_457f1
ld hl, SilphCoElevatorWarpMaps
predef Func_1c9c6
--- a/scripts/ssanne10.asm
+++ b/scripts/ssanne10.asm
@@ -83,37 +83,37 @@
db $ff
SSAnne10Text1: ; 61dcd (18:5dcd)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SSAnne10Text2: ; 61dd7 (18:5dd7)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SSAnne10Text3: ; 61de1 (18:5de1)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SSAnne10Text4: ; 61deb (18:5deb)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SSAnne10Text5: ; 61df5 (18:5df5)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SSAnne10Text6: ; 61dff (18:5dff)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne10TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -120,7 +120,7 @@
SSAnne10Text8: ; 61e09 (18:5e09)
TX_FAR _SSAnne10Text8
- db $08 ; asm
+ TX_ASM
ld a, MACHOKE
call PlayCry
jp TextScriptEnd
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -178,7 +178,7 @@
db "@"
SSAnne2Text2: ; 614e6 (18:54e6)
- db $8
+ TX_ASM
ld hl, SSAnneRivalBeforeBattleText
call PrintText
ld hl, wd72d
--- a/scripts/ssanne5.asm
+++ b/scripts/ssanne5.asm
@@ -53,7 +53,7 @@
db "@"
SSAnne5Text4: ; 616f9 (18:56f9)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -71,7 +71,7 @@
db "@"
SSAnne5Text5: ; 61712 (18:5712)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne5TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/ssanne6.asm
+++ b/scripts/ssanne6.asm
@@ -36,7 +36,7 @@
db "@"
SSAnne6Text7: ; 617e3 (18:57e3)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne6Text_61807
call PrintText
ldh a, [$d3]
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -16,7 +16,7 @@
dw SSAnne7Text3
SSAnne7Text1: ; 618ad (18:58ad)
- db $08 ; asm
+ TX_ASM
ld a, [wd803]
bit 0, a
jr nz, .asm_797c4
@@ -46,7 +46,7 @@
SSAnne7RubText: ; 618ec (18:58ec)
TX_FAR _SSAnne7RubText
- db $8
+ TX_ASM
ld a, [wc0ef]
cp BANK(Music1f_UpdateMusic)
ld [wc0f0], a
--- a/scripts/ssanne8.asm
+++ b/scripts/ssanne8.asm
@@ -65,25 +65,25 @@
db $ff
SSAnne8Text1: ; 619d6 (18:59d6)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne8TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SSAnne8Text2: ; 619e0 (18:59e0)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne8TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SSAnne8Text3: ; 619ea (18:59ea)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne8TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SSAnne8Text4: ; 619f4 (18:59f4)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne8TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -90,7 +90,7 @@
SSAnne8Text8: ; 619fe (18:59fe)
TX_FAR _SSAnne8Text8
- db $08 ; asm
+ TX_ASM
ld a, WIGGLYTUFF
call PlayCry
jp TextScriptEnd
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -70,31 +70,31 @@
db $ff
SSAnne9Text1: ; 61bb5 (18:5bb5)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SSAnne9Text2: ; 61bbf (18:5bbf)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SSAnne9Text3: ; 61bc9 (18:5bc9)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SSAnne9Text4: ; 61bd3 (18:5bd3)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SSAnne9Text5: ; 61bdd (18:5bdd)
- db $08 ; asm
+ TX_ASM
call SaveScreenTilesToBuffer1
ld hl, SSAnne9Text_61bf2
call PrintText
@@ -108,7 +108,7 @@
db "@"
SSAnne9Text7: ; 61bf7 (18:5bf7)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c01
call PrintText
jp TextScriptEnd
@@ -118,7 +118,7 @@
db "@"
SSAnne9Text8: ; 61c06 (18:5c06)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c10
call PrintText
jp TextScriptEnd
@@ -128,7 +128,7 @@
db "@"
SSAnne9Text10: ; 61c15 (18:5c15)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c1f
call PrintText
jp TextScriptEnd
@@ -138,7 +138,7 @@
db "@"
SSAnne9Text11: ; 61c24 (18:5c24)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c2e
call PrintText
jp TextScriptEnd
@@ -148,7 +148,7 @@
db "@"
SSAnne9Text12: ; 61c33 (18:5c33)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c3d
call PrintText
jp TextScriptEnd
@@ -158,7 +158,7 @@
db "@"
SSAnne9Text13: ; 61c42 (18:5c42)
- db $08 ; asm
+ TX_ASM
ld hl, SSAnne9Text_61c4c
call PrintText
jp TextScriptEnd
--- a/scripts/undergroundpathentranceroute5.asm
+++ b/scripts/undergroundpathentranceroute5.asm
@@ -10,7 +10,7 @@
dw UndergroundPathEntranceRoute5Text1
UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2)
- db $08 ; asm
+ TX_ASM
ld a, $9
ld [wWhichTrade], a
predef DoInGameTradeDialogue
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -30,7 +30,7 @@
db $ff
UnknownDungeon3Text1: ; 45f1c (11:5f1c)
- db $08 ; asm
+ TX_ASM
ld hl, UnknownDungeon3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -37,7 +37,7 @@
UnknownDungeon3MewtwoText: ; 45f26 (11:5f26)
TX_FAR _UnknownDungeon3MewtwoText
- db $8
+ TX_ASM
ld a, MEWTWO
call PlayCry
call WaitForSoundToFinish
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -135,7 +135,7 @@
db "@"
VermilionCityText2: ; 1988e (6:588e)
- db $08 ; asm
+ TX_ASM
ld a, [wd803]
bit 2, a
jr nz, .asm_1989e
@@ -157,7 +157,7 @@
db "@"
VermilionCityText3: ; 198b1 (6:58b1)
- db $08 ; asm
+ TX_ASM
ld a, [wd803]
bit 2, a
jr nz, .asm_198f6
@@ -225,7 +225,7 @@
VermilionCityText5: ; 19922 (6:5922)
TX_FAR _VermilionCityText5
- db $08 ; asm
+ TX_ASM
ld a, MACHOP
call PlayCry
call WaitForSoundToFinish
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -135,7 +135,7 @@
db $ff
VermilionGymText1: ; 5cb1d (17:4b1d)
- db $08 ; asm
+ TX_ASM
ld a, [wd773]
bit 7, a
jr z, .asm_5cb39
@@ -198,7 +198,7 @@
db "@"
VermilionGymText2: ; 5cb90 (17:4b90)
- db $08 ; asm
+ TX_ASM
ld hl, VermilionGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -216,7 +216,7 @@
db "@"
VermilionGymText3: ; 5cba9 (17:4ba9)
- db $08 ; asm
+ TX_ASM
ld hl, VermilionGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -234,7 +234,7 @@
db "@"
VermilionGymText4: ; 5cbc2 (17:4bc2)
- db $08 ; asm
+ TX_ASM
ld hl, VermilionGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -252,7 +252,7 @@
db "@"
VermilionGymText5: ; 5cbdb (17:4bdb)
- db $08 ; asm
+ TX_ASM
ld a, [wd72a]
bit 2, a
jr nz, .asm_5cbeb
--- a/scripts/vermilionhouse1.asm
+++ b/scripts/vermilionhouse1.asm
@@ -13,7 +13,7 @@
VermilionHouse1Text2: ; 1db0b (7:5b0b)
TX_FAR _VermilionHouse1Text2
- db $08 ; asm
+ TX_ASM
ld a, PIDGEY
call PlayCry
call WaitForSoundToFinish
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/vermilionhouse2.asm
@@ -5,7 +5,7 @@
dw VermilionHouse2Text1
VermilionHouse2Text1: ; 56075 (15:6075)
- db $08 ; asm
+ TX_ASM
ld a, [wd728]
bit 3, a
jr nz, .asm_03ef5
--- a/scripts/vermilionhouse3.asm
+++ b/scripts/vermilionhouse3.asm
@@ -5,7 +5,7 @@
dw VermilionHouse3Text1
VermilionHouse3Text1: ; 19c17 (6:5c17)
- db $08 ; asm
+ TX_ASM
ld a, $4
ld [wWhichTrade], a
predef DoInGameTradeDialogue
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -71,13 +71,13 @@
db $ff
VictoryRoad1Text1: ; 5da86 (17:5a86)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
VictoryRoad1Text2: ; 5da90 (17:5a90)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad1TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -143,37 +143,37 @@
db $ff
VictoryRoad2Text1: ; 5187e (14:587e)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
VictoryRoad2Text2: ; 51888 (14:5888)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
VictoryRoad2Text3: ; 51892 (14:5892)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
VictoryRoad2Text4: ; 5189c (14:589c)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
VictoryRoad2Text5: ; 518a6 (14:58a6)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
VictoryRoad2Text6: ; 518b0 (14:58b0)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad2TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -180,7 +180,7 @@
VictoryRoad2BattleText6: ; 518ba (14:58ba)
TX_FAR _VictoryRoad2BattleText6
- db $8
+ TX_ASM
ld a, MOLTRES
call PlayCry
call WaitForSoundToFinish
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -130,25 +130,25 @@
db $ff
VictoryRoad3Text1: ; 44a69 (11:4a69)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
VictoryRoad3Text2: ; 44a73 (11:4a73)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
VictoryRoad3Text3: ; 44a7d (11:4a7d)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
VictoryRoad3Text4: ; 44a87 (11:4a87)
- db $08 ; asm
+ TX_ASM
ld hl, VictoryRoad3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -149,7 +149,7 @@
db "@"
ViridianCityText2: ; 19107 (6:5107)
- db $08 ; asm
+ TX_ASM
ld a, [W_OBTAINEDBADGES]
cp %01111111
ld hl, ViridianCityText_19127
@@ -171,7 +171,7 @@
db "@"
ViridianCityText3: ; 1912c (6:512c)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianCityText_1914d
call PrintText
call YesNoChoice
@@ -200,7 +200,7 @@
db "@"
ViridianCityText4: ; 1915c (6:515c)
- db $08 ; asm
+ TX_ASM
ld a, [wd74b]
bit 5, a
jr nz, .asm_83894
@@ -222,7 +222,7 @@
db "@"
ViridianCityText5: ; 1917f (6:517f)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianCityText_19191
call PrintText
call ViridianCityScript_190cf
@@ -235,7 +235,7 @@
db "@"
ViridianCityText6: ; 19196 (6:5196)
- db $08 ; asm
+ TX_ASM
ld a, [wd74c]
bit 1, a
jr nz, .asm_4e5a0
@@ -276,7 +276,7 @@
db "@"
ViridianCityText7: ; 191df (6:51df)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianCityText_1920a
call PrintText
ld c, 2
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -63,19 +63,19 @@
db "@"
ViridianForestText2: ; 6116c (18:516c)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
ViridianForestText3: ; 61176 (18:5176)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
ViridianForestText4: ; 61180 (18:5180)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -275,7 +275,7 @@
db $ff
ViridianGymText1: ; 74a69 (1d:4a69)
- db $08 ; asm
+ TX_ASM
ld a, [wd751]
bit 1, a
jr z, .asm_6de66
@@ -346,7 +346,7 @@
db "@"
ViridianGymText2: ; 74af3 (1d:4af3)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@@ -364,7 +364,7 @@
db "@"
ViridianGymText3: ; 74b0c (1d:4b0c)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@@ -382,7 +382,7 @@
db "@"
ViridianGymText4: ; 74b25 (1d:4b25)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@@ -400,7 +400,7 @@
db "@"
ViridianGymText5: ; 74b3e (1d:4b3e)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@@ -418,7 +418,7 @@
db "@"
ViridianGymText6: ; 74b57 (1d:4b57)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@@ -436,7 +436,7 @@
db "@"
ViridianGymText7: ; 74b70 (1d:4b70)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@@ -454,7 +454,7 @@
db "@"
ViridianGymText8: ; 74b89 (1d:4b89)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@@ -472,7 +472,7 @@
db "@"
ViridianGymText9: ; 74ba2 (1d:4ba2)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianGymTrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@@ -490,7 +490,7 @@
db "@"
ViridianGymText10: ; 74bbb (1d:4bbb)
- db $08 ; asm
+ TX_ASM
ld a, [wd751]
bit 1, a
jr nz, .asm_1abd1
--- a/scripts/viridianhouse.asm
+++ b/scripts/viridianhouse.asm
@@ -16,7 +16,7 @@
db "@"
ViridianHouseText3: ; 1d59f (7:559f)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianHouseText_1d5b1
call PrintText
ld a, SPEAROW