thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-10 23:40:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

TX_ASM

Browse source
This commit is contained in:
U-Daniel-PC\Daniel 2015-07-03 14:58:50 -05:00
parent 80621d3731
commit 8431fa7756
155 changed files with 595 additions and 591 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/battle/common_text.asm
View file

@ -139,22 +139,22 @@ PrintSendOutMonMessage: ; 58e59 (16:4e59)
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 @@ RetreatMon: ; 58ed1 (16:4ed1)
PlayerMon2Text: ; 58ed7 (16:4ed7)
TX_FAR _PlayerMon2Text
db $08 ; asm
TX_ASM
push de
push bc
ld hl, wEnemyMonHP + 1
@ -216,17 +216,17 @@ PlayerMon2Text: ; 58ed7 (16:4ed7)
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)

16
engine/battle/core.asm
View file

@ -3773,7 +3773,7 @@ PrintMonName1Text: ; 3daf5 (f:5af5)
; 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 @@ MonName1Text: ; 3dafb (f:5afb)
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 @@ PrintInsteadText: ; 3db39 (f:5b39)
InsteadText: ; 3db43 (f:5b43)
TX_FAR _InsteadText
db $08 ; asm
TX_ASM
; fall through
PrintMoveName: ; 3db48 (f:5b48)
@ -3824,7 +3824,7 @@ PrintMoveName: ; 3db48 (f:5b48)
_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 @@ PrintNothingHappenedText: ; 3f522 (f:7522)
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 @@ MoveMissed: ; 3f65a (f:765a)
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 @@ ChargeEffect: ; 3f88c (f:788c)
ChargeMoveEffectText: ; 3f8c8 (f:78c8)
TX_FAR _ChargeMoveEffectText
db $08 ; asm
TX_ASM
ld a, [wWhichTrade]
cp RAZOR_WIND
ld hl, MadeWhirlwindText

4
engine/battle/experience.asm
View file

@ -341,7 +341,7 @@ BoostExp: ; 5549f (15:549f)
GainedText: ; 554b2 (15:54b2)
TX_FAR _GainedText
db $08 ; asm
TX_ASM
ld a, [wBoostExpByExpAll]
ld hl, WithExpAllText
and a
@ -355,7 +355,7 @@ GainedText: ; 554b2 (15:54b2)
WithExpAllText: ; 554cb (15:54cb)
TX_FAR _WithExpAllText
db $08 ; asm
TX_ASM
ld hl, ExpPointsText
ret

2
engine/hidden_object_functions14.asm
View file

@ -11,7 +11,7 @@ TMNotebook: ; 529a4 (14:69a4)
db "@"
ViridianSchoolNotebook: ; 529aa (14:69aa)
db $08 ; asm
TX_ASM
ld hl, ViridianSchoolNotebookText1
call PrintText
call TurnPageSchoolNotebook

12
engine/hidden_object_functions17.asm
View file

@ -95,7 +95,7 @@ PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a)
ret
LinkCableHelp: ; 5dc29 (17:5c29)
db $08 ; asm
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, LinkCableHelpText1
call PrintText
@ -179,7 +179,7 @@ LinkCableInfoText3: ; 5dce8 (17:5ce8)
db "@"
ViridianSchoolBlackboard: ; 5dced (17:5ced)
db $08 ; asm
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, ViridianSchoolBlackboardText1
call PrintText
@ -428,7 +428,7 @@ GymTrashCans: ; 5de7d (17:5e7d)
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 @@ VermilionGymTrashSuccesText2: ; 5dedb (17:5edb)
; 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 @@ VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0)
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 @@ VermilionGymTrashSuccesText3: ; 5deef (17:5eef)
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

2
engine/hidden_object_functions18.asm
View file

@ -139,7 +139,7 @@ CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df)
db "@"
SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4)
db $8 ; asm
TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SaffronCityPokecenterBenchGuyText2

6
engine/hidden_object_functions3.asm
View file

@ -60,7 +60,7 @@ BookshelfTileIDs: ; fb8b (3:7b8b)
db $FF
IndigoPlateauStatues: ; fbbf (3:7bbf)
db $08 ; asm
TX_ASM
ld hl, IndigoPlateauStatuesText1
call PrintText
ld a, [W_XCOORD]
@ -85,7 +85,7 @@ IndigoPlateauStatuesText3: ; fbe3 (3:7be3)
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 @@ ElevatorText: ; fc0d (3:7c0d)
TownMapText: ; fc12 (3:7c12)
TX_FAR _TownMapText
db $06
db $08 ; asm
TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd730

8
engine/hidden_object_functions7.asm
View file

@ -99,7 +99,7 @@ PrintSafariGameOverText: ; 1e9ed (7:69ed)
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 @@ PrintCinnabarQuiz: ; 1ea17 (7:6a17)
jp PrintPredefTextID
CinnabarGymQuiz: ; 1ea25 (7:6a25)
db $08 ; asm
TX_ASM
xor a
ld [wda38], a
ld a, [wWhichTrade]
@ -375,7 +375,7 @@ BillsHouseMonitorText: ; 1ebdd (7:6bdd)
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 @@ BillsHouseInitiatedText: ; 1ebe2 (7:6be2)
jp TextScriptEnd
BillsHousePokemonList: ; 1ec05 (7:6c05)
db $08 ; asm
TX_ASM
call SaveScreenTilesToBuffer1
ld hl, BillsHousePokemonListText1
call PrintText

2
engine/learn_move.asm
View file

@ -206,7 +206,7 @@ TryingToLearnText: ; 6fc3 (1:6fc3)
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

2
engine/overworld/hidden_items.asm
View file

@ -23,7 +23,7 @@ INCLUDE "data/hidden_item_coords.asm"
FoundHiddenItemText: ; 7675b (1d:675b)
TX_FAR _FoundHiddenItemText
db $8
TX_ASM
ld a, [wWhichTrade] ; item ID
ld b, a
ld c, 1

2
engine/slot_machine.asm
View file

@ -456,7 +456,7 @@ SlotMachine_37588: ; 37588 (d:7588)
jp .loop
SlotsMachineText_37665: ; 37665 (d:7665)
db $08 ; asm
TX_ASM
push bc
call SlotMachine_37728
ld hl, LinedUpText

4
home.asm
View file

@ -971,7 +971,7 @@ PokeCenterSignText:: ; 24ef (0:24ef)
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 @@ GetSavedEndBattleTextPointer:: ; 33b7 (0:33b7)
TrainerEndBattleText:: ; 33cf (0:33cf)
TX_FAR _TrainerNameText
db $08
TX_ASM
call GetSavedEndBattleTextPointer
call TextCommandProcessor
jp TextScriptEnd

4
macros.asm
View file

@ -195,6 +195,10 @@ TX_BCD: MACRO
db \2
ENDM
TX_ASM: MACRO
db $08
ENDM
; Predef macro.
add_predef: MACRO
\1Predef::

2
main.asm
View file

@ -2726,7 +2726,7 @@ PrintStrengthTxt: ; cd99 (3:4d99)
UsedStrengthText: ; cdaa (3:4daa)
TX_FAR _UsedStrengthText
db $08 ; asm
TX_ASM
ld a, [wcf91]
call PlayCry
call Delay3

2
scripts/agatha.asm
View file

@ -135,7 +135,7 @@ AgathaTrainerHeader0: ; 76509 (1d:6509)
db $ff
AgathaText1: ; 76516 (1d:6516)
db $08 ; asm
TX_ASM
ld hl, AgathaTrainerHeader0
call TalkToTrainer
jp TextScriptEnd

6
scripts/bikeshop.asm
View file

@ -7,7 +7,7 @@ BikeShopTextPointers: ; 1d73f (7:573f)
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 @@ BikeShopText_1d834: ; 1d834 (7:5834)
db "@"
BikeShopText2: ; 1d839 (7:5839)
db $08 ; asm
TX_ASM
ld hl, BikeShopText_1d843
call PrintText
jp TextScriptEnd
@ -130,7 +130,7 @@ BikeShopText_1d843: ; 1d843 (7:5843)
db "@"
BikeShopText3: ; 1d848 (7:5848)
db $08 ; asm
TX_ASM
ld a, [wd75f]
bit 0, a
ld hl, BikeShopText_1d861

6
scripts/billshouse.asm
View file

@ -115,7 +115,7 @@ BillsHouseText4: ; 1e83c (7:683c)
db $fd
BillsHouseText1: ; 1e83d (7:683d)
db $8
TX_ASM
ld hl, BillsHouseText_1e865
call PrintText
call YesNoChoice
@ -148,7 +148,7 @@ BillsHouseText_1e86f: ; 1e86f (7:686f)
db "@"
BillsHouseText2: ; 1e874 (7:6874)
db $08 ; asm
TX_ASM
ld a, [wd7f2]
bit 4, a
jr nz, .asm_1e8a9
@ -194,7 +194,7 @@ BillsHouseText_1e8cb: ; 1e8cb (7:68cb)
db "@"
BillsHouseText3: ; 1e8d0 (7:68d0)
db $08 ; asm
TX_ASM
ld hl, BillsHouseText_1e8da
call PrintText
jp TextScriptEnd

2
scripts/bruno.asm
View file

@ -132,7 +132,7 @@ BrunoTrainerHeader0: ; 763ac (1d:63ac)
db $ff
BrunoText1: ; 763b9 (1d:63b9)
db $08 ; asm
TX_ASM
ld hl, BrunoTrainerHeader0
call TalkToTrainer
jp TextScriptEnd

4
scripts/celadoncity.asm
View file

@ -44,7 +44,7 @@ CeladonCityText4: ; 19999 (6:5999)
db "@"
CeladonCityText5: ; 1999e (6:599e)
db $08 ; asm
TX_ASM
ld a, [wd777]
bit 0, a
jr nz, .asm_7053f
@ -90,7 +90,7 @@ CeladonCityText6: ; 199e7 (6:59e7)
CeladonCityText7: ; 199ec (6:59ec)
TX_FAR _CeladonCityText7
db $08 ; asm
TX_ASM
ld a, POLIWRATH
call PlayCry
jp TextScriptEnd

2
scripts/celadondiner.asm
View file

@ -26,7 +26,7 @@ CeladonDinerText4: ; 4916e (12:516e)
db "@"
CeladonDinerText5: ; 49173 (12:5173)
db $08 ; asm
TX_ASM
ld a, [wd783]
bit 0, a
jr nz, .asm_eb14d

16
scripts/celadongamecorner.asm
View file

@ -124,7 +124,7 @@ CeladonGameCornerText1: ; 48ca4 (12:4ca4)
db "@"
CeladonGameCornerText2: ; 48ca9 (12:4ca9)
db $08 ; asm
TX_ASM
call CeladonGameCornerScript_48f1e
ld hl, CeladonGameCornerText_48d22
call PrintText
@ -213,7 +213,7 @@ CeladonGameCornerText4: ; 48d45 (12:4d45)
db "@"
CeladonGameCornerText5: ; 48d4a (12:4d4a)
db $08 ; asm
TX_ASM
ld a, [wd77e]
bit 2, a
jr nz, .asm_48d89
@ -272,7 +272,7 @@ CeladonGameCornerText6: ; 48db1 (12:4db1)
db "@"
CeladonGameCornerText7: ; 48db6 (12:4db6)
db $08 ; asm
TX_ASM
ld a, [wd77c]
bit 1, a
ld hl, CeladonGameCornerText_48dca
@ -295,7 +295,7 @@ CeladonGameCornerText8: ; 48dd4 (12:4dd4)
db "@"
CeladonGameCornerText9: ; 48dd9 (12:4dd9)
db $08 ; asm
TX_ASM
ld a, [wd77e]
bit 4, a
jr nz, .asm_48e13
@ -348,7 +348,7 @@ CeladonGameCornerText_48e36: ; 48e36 (12:4e36)
db "@"
CeladonGameCornerText10: ; 48e3b (12:4e3b)
db $08 ; asm
TX_ASM
ld a, [wd77e]
bit 3, a
jr nz, .asm_48e75
@ -401,7 +401,7 @@ CeladonGameCornerText_48e98: ; 48e98 (12:4e98)
db "@"
CeladonGameCornerText11: ; 48e9d (12:4e9d)
db $08 ; asm
TX_ASM
ld hl, CeladonGameCornerText_48ece
call PrintText
ld hl, wd72d
@ -435,7 +435,7 @@ CeladonGameCornerText13: ; 48ed8 (12:4ed8)
db "@"
CeladonGameCornerText12: ; 48edd (12:4edd)
db $08 ; asm
TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CeladonGameCornerText_48f09
@ -454,7 +454,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
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

16
scripts/celadongym.asm
View file

@ -156,7 +156,7 @@ CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
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 @@ TM21NoRoomText: ; 48a7c (12:4a7c)
db "@"
CeladonGymText2: ; 48a81 (12:4a81)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -235,7 +235,7 @@ CeladonGymAfterBattleText2: ; 48a95 (12:4a95)
db "@"
CeladonGymText3: ; 48a9a (12:4a9a)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -253,7 +253,7 @@ CeladonGymAfterBattleText3: ; 48aae (12:4aae)
db "@"
CeladonGymText4: ; 48ab3 (12:4ab3)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -271,7 +271,7 @@ CeladonGymAfterBattleText4: ; 48ac7 (12:4ac7)
db "@"
CeladonGymText5: ; 48acc (12:4acc)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -289,7 +289,7 @@ CeladonGymAfterBattleText5: ; 48ae0 (12:4ae0)
db "@"
CeladonGymText6: ; 48ae5 (12:4ae5)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -307,7 +307,7 @@ CeladonGymAfterBattleText6: ; 48af9 (12:4af9)
db "@"
CeladonGymText7: ; 48afe (12:4afe)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -325,7 +325,7 @@ CeladonGymAfterBattleText7: ; 48b12 (12:4b12)
db "@"
CeladonGymText8: ; 48b17 (12:4b17)
db $08 ; asm
TX_ASM
ld hl, CeladonGymTrainerHeader7
call TalkToTrainer
jp TextScriptEnd

6
scripts/celadonmansion1.asm
View file

@ -14,7 +14,7 @@ CeladonMansion1_486a1: ; 486a1 (12:46a1)
CeladonMansion1Text1: ; 486a7 (12:46a7)
TX_FAR _CeladonMansion1Text1
db $08 ; asm
TX_ASM
ld a, MEOWTH
jp CeladonMansion1_486a1
@ -24,13 +24,13 @@ CeladonMansion1Text2: ; 486b1 (12:46b1)
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

4
scripts/celadonmansion3.asm
View file

@ -24,7 +24,7 @@ WriterText: ; 487ad (12:47ad)
db "@"
DirectorText: ; 487b2 (12:47b2)
db $08 ; asm
TX_ASM
; check pokédex
ld hl, wPokedexOwned
@ -48,7 +48,7 @@ DirectorText: ; 487b2 (12:47b2)
.CompletedDexText
TX_FAR _CompletedDexText
db $6
db $8 ; asm
TX_ASM
callab DisplayDiploma
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a

2
scripts/celadonmansion5.asm
View file

@ -10,7 +10,7 @@ CeladonMansion5Text1: ; 1dd41 (7:5d41)
db "@"
CeladonMansion5Text2: ; 1dd46 (7:5d46)
db $08 ; asm
TX_ASM
ld bc,(EEVEE << 8) | 25
call GivePokemon
jr nc, .asm_24365

2
scripts/celadonmart3.asm
View file

@ -21,7 +21,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228)
dw CeladonMart3Text17
CeladonMart3Text1: ; 4824a (12:424a)
db $08 ; asm
TX_ASM
ld a, [wd778]
bit 7, a
jr nz, .asm_a5463

2
scripts/celadonmartelevator.asm
View file

@ -63,7 +63,7 @@ CeladonMartElevatorTextPointers: ; 4865c (12:465c)
dw CeladonMartElevatorText1
CeladonMartElevatorText1: ; 4865e (12:465e)
db $08 ; asm
TX_ASM
call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps
predef Func_1c9c6

2
scripts/celadonmartroof.asm
View file

@ -224,7 +224,7 @@ CeladonMartRoofText1: ; 48567 (12:4567)
db "@"
CeladonMartRoofText2: ; 4856c (12:456c)
db $08 ; asm
TX_ASM
call CeladonMartRoofScript_483d8
ld a, [wcd37]
and a

8
scripts/ceruleancity.asm
View file

@ -234,7 +234,7 @@ CeruleanCityTextPointers: ; 1962d (6:562d)
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 @@ CeruleanCityText_19677: ; 19677 (6:5677)
db "@"
CeruleanCityText2: ; 1967c (6:567c)
db $8
TX_ASM
ld a, [wd75b]
bit 7, a
jr nz, .asm_4ca20
@ -343,7 +343,7 @@ CeruleanCityText6: ; 19707 (6:5707)
db "@"
CeruleanCityText7: ; 1970c (6:570c)
db $08 ; asm
TX_ASM
ldh a, [$d3]
cp $b4
jr c, .asm_e9fc9
@ -375,7 +375,7 @@ CeruleanCityText_1973a: ; 1973a (6:573a)
db "@"
CeruleanCityText8: ; 1973f (6:573f)
db $08 ; asm
TX_ASM
ld a, [hRandomAdd]
cp $b4
jr c, .asm_e28da

8
scripts/ceruleangym.asm
View file

@ -105,7 +105,7 @@ CeruleanGymTrainerHeader1: ; 5c764 (17:4764)
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 @@ CeruleanGymText_5c7d8: ; 5c7d8 (17:47d8)
db $11, $6, "@"
CeruleanGymText2: ; 5c7df (17:47df)
db $08 ; asm
TX_ASM
ld hl, CeruleanGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -184,7 +184,7 @@ CeruleanGymAfterBattleText1: ; 5c7f3 (17:47f3)
db "@"
CeruleanGymText3: ; 5c7f8 (17:47f8)
db $08 ; asm
TX_ASM
ld hl, CeruleanGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -202,7 +202,7 @@ CeruleanGymAfterBattleText2: ; 5c80c (17:480c)
db "@"
CeruleanGymText4: ; 5c811 (17:4811)
db $08 ; asm
TX_ASM
ld a, [wd75e]
bit 7, a
jr nz, .asm_5c821

2
scripts/ceruleanhouse1.asm
View file

@ -10,7 +10,7 @@ CeruleanHouse1Text1: ; 1d6fd (7:56fd)
db "@"
CeruleanHouse1Text2: ; 1d702 (7:5702)
db $08 ; asm
TX_ASM
ld a, $6
ld [wWhichTrade], a
predef DoInGameTradeDialogue

2
scripts/ceruleanhouse2.asm
View file

@ -9,7 +9,7 @@ CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)
dw CeruleanHouse2Text1
CeruleanHouse2Text1: ; 74e15 (1d:4e15)
db $8
TX_ASM
ld hl, CeruleanHouse2Text_74e77
call PrintText
xor a

2
scripts/ceruleanhousetrashed.asm
View file

@ -8,7 +8,7 @@ CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689)
dw CeruleanHouseTrashedText3
CeruleanHouseTrashedText1: ; 1d68f (7:568f)
db $08 ; asm
TX_ASM
ld b, $e4
predef IsItemInBag_
and b

18
scripts/cinnabargym.asm
View file

@ -206,7 +206,7 @@ CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
jp TextScriptEnd
CinnabarGymText1: ; 758df (1d:58df)
db $8
TX_ASM
ld a, [wd79a]
bit 1, a
jr z, .asm_d9332
@ -258,7 +258,7 @@ TM38NoRoomText: ; 75934 (1d:5934)
db "@"
CinnabarGymText2: ; 75939 (1d:5939)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 2, a
@ -287,7 +287,7 @@ CinnabarGymText_75969: ; 75969 (1d:5969)
db "@"
CinnabarGymText3: ; 7596e (1d:596e)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 3, a
@ -316,7 +316,7 @@ CinnabarGymText_7599e: ; 7599e (1d:599e)
db "@"
CinnabarGymText4: ; 759a3 (1d:59a3)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 4, a
@ -345,7 +345,7 @@ CinnabarGymText_759d3: ; 759d3 (1d:59d3)
db "@"
CinnabarGymText5: ; 759d8 (1d:59d8)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 5, a
@ -374,7 +374,7 @@ CinnabarGymText_75a08: ; 75a08 (1d:5a08)
db "@"
CinnabarGymText6: ; 75a0d (1d:5a0d)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 6, a
@ -403,7 +403,7 @@ CinnabarGymText_75a3d: ; 75a3d (1d:5a3d)
db "@"
CinnabarGymText7: ; 75a42 (1d:5a42)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79a]
bit 7, a
@ -432,7 +432,7 @@ CinnabarGymText_75a72: ; 75a72 (1d:5a72)
db "@"
CinnabarGymText8: ; 75a77 (1d:5a77)
db $08 ; asm
TX_ASM
call CinnabarGymScript_757a0
ld a, [wd79b]
bit 0, a
@ -461,7 +461,7 @@ CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7)
db "@"
CinnabarGymText9: ; 75aac (1d:5aac)
db $08 ; asm
TX_ASM
ld a, [wd79a]
bit 1, a
jr nz, .asm_627d9

2
scripts/copycatshouse1f.asm
View file

@ -16,7 +16,7 @@ CopycatsHouse1FText2: ; 75ed1 (1d:5ed1)
CopycatsHouse1FText3: ; 75ed6 (1d:5ed6)
TX_FAR _CopycatsHouse1FText3
db $8
TX_ASM
ld a, CHANSEY
call PlayCry
jp TextScriptEnd

4
scripts/copycatshouse2f.asm
View file

@ -11,7 +11,7 @@ CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74)
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 @@ CopycatsHouse2FText6: ; 5ccfe (17:4cfe)
db "@"
CopycatsHouse2FText7: ; 5cd03 (17:4d03)
db $08 ; asm
TX_ASM
ld a, [wSpriteStateData1 + 9]
cp $4
ld hl, CopycatsHouse2FText_5cd1c

2
scripts/daycarem.asm
View file

@ -5,7 +5,7 @@ DayCareMTextPointers: ; 56252 (15:6252)
dw DayCareMText1
DayCareMText1: ; 56254 (15:6254)
db $8
TX_ASM
call SaveScreenTilesToBuffer2
ld a, [W_DAYCARE_IN_USE]
and a

10
scripts/fanclub.asm
View file

@ -24,7 +24,7 @@ FanClubTextPointers: ; 59b84 (16:5b84)
FanClubText1:
; pikachu fan
db $08 ; asm
TX_ASM
ld a, [wd771]
bit 7, a
jr nz, .mineisbetter
@ -51,7 +51,7 @@ FanClubText1:
FanClubText2:
; seel fan
db $08 ; asm
TX_ASM
ld a, [wd771]
bit 6, a
jr nz, .mineisbetter
@ -78,7 +78,7 @@ FanClubText2:
FanClubText3:
; pikachu
db $8
TX_ASM
ld hl, .text
call PrintText
ld a, PIKACHU
@ -92,7 +92,7 @@ FanClubText3:
FanClubText4:
; seel
db $08 ; asm
TX_ASM
ld hl, .text
call PrintText
ld a, SEEL
@ -106,7 +106,7 @@ FanClubText4:
FanClubText5:
; chair
db $08 ; asm
TX_ASM
call FanClubBikeInBag
jr nz, .nothingleft

14
scripts/fightingdojo.asm
View file

@ -134,7 +134,7 @@ FightingDojoTrainerHeader3: ; 5ce37 (17:4e37)
db $ff
FightingDojoText1: ; 5ce44 (17:4e44)
db $08 ; asm
TX_ASM
ld a, [wd7b1]
bit 0, a
jp nz, .continue1
@ -183,7 +183,7 @@ FightingDojoText_5ce9d: ; 5ce9d (17:4e9d)
db "@"
FightingDojoText2: ; 5cea2 (17:4ea2)
db $08 ; asm
TX_ASM
ld hl, FightingDojoTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -201,7 +201,7 @@ FightingDojoAfterBattleText1: ; 5ceb6 (17:4eb6)
db "@"
FightingDojoText3: ; 5cebb (17:4ebb)
db $08 ; asm
TX_ASM
ld hl, FightingDojoTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -219,7 +219,7 @@ FightingDojoAfterBattleText2: ; 5cecf (17:4ecf)
db "@"
FightingDojoText4: ; 5ced4 (17:4ed4)
db $08 ; asm
TX_ASM
ld hl, FightingDojoTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -237,7 +237,7 @@ FightingDojoAfterBattleText3: ; 5cee8 (17:4ee8)
db "@"
FightingDojoText5: ; 5ceed (17:4eed)
db $08 ; asm
TX_ASM
ld hl, FightingDojoTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -256,7 +256,7 @@ FightingDojoAfterBattleText4: ; 5cf01 (17:4f01)
FightingDojoText6: ; 5cf06 (17:4f06)
; Hitmonlee Poké Ball
db $08 ; asm
TX_ASM
ld a, [wd7b1]
and %11000000
jr z, .GetMon
@ -294,7 +294,7 @@ WantHitmonleeText: ; 5cf49 (17:4f49)
FightingDojoText7: ; 5cf4e (17:4f4e)
; Hitmonchan Poké Ball
db $08 ; asm
TX_ASM
ld a, [wd7b1]
and %11000000
jr z, .GetMon

12
scripts/fuchsiacity.asm
View file

@ -74,7 +74,7 @@ FuchsiaCityText18: ; 19a8b (6:5a8b)
db "@"
FuchsiaCityText19: ; 19a90 (6:5a90)
db $08 ; asm
TX_ASM
ld hl, FuchsiaCityChanseyText
call PrintText
ld a, CHANSEY
@ -86,7 +86,7 @@ FuchsiaCityChanseyText: ; 19a9f (6:5a9f)
db "@"
FuchsiaCityText20: ; 19aa4 (6:5aa4)
db $08 ; asm
TX_ASM
ld hl, FuchsiaCityVoltorbText
call PrintText
ld a, VOLTORB
@ -98,7 +98,7 @@ FuchsiaCityVoltorbText: ; 19ab3 (6:5ab3)
db "@"
FuchsiaCityText21: ; 19ab8 (6:5ab8)
db $08 ; asm
TX_ASM
ld hl, FuchsiaCityKangaskhanText
call PrintText
ld a, KANGASKHAN
@ -110,7 +110,7 @@ FuchsiaCityKangaskhanText: ; 19ac7 (6:5ac7)
db "@"
FuchsiaCityText22: ; 19acc (6:5acc)
db $08 ; asm
TX_ASM
ld hl, FuchsiaCitySlowpokeText
call PrintText
ld a, SLOWPOKE
@ -122,7 +122,7 @@ FuchsiaCitySlowpokeText: ; 19adb (6:5adb)
db "@"
FuchsiaCityText23: ; 19ae0 (6:5ae0)
db $08 ; asm
TX_ASM
ld hl, FuchsiaCityLaprasText
call PrintText
ld a, LAPRAS
@ -134,7 +134,7 @@ FuchsiaCityLaprasText: ; 19aef (6:5aef)
db "@"
FuchsiaCityText24: ; 19af4 (6:5af4)
db $08 ; asm
TX_ASM
ld a, [wd7f6]
bit 6, a
jr nz, .asm_3b4e8

16
scripts/fuchsiagym.asm
View file

@ -145,7 +145,7 @@ FuchsiaGymTrainerHeader6: ; 75527 (1d:5527)
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 @@ FuchsiaGymText11: ; 7559f (1d:559f)
db "@"
FuchsiaGymText2: ; 755a4 (1d:55a4)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -227,7 +227,7 @@ FuchsiaGymAfterBattleText1: ; 755b8 (1d:55b8)
db "@"
FuchsiaGymText3: ; 755bd (1d:55bd)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -245,7 +245,7 @@ FuchsiaGymAfterBattleText2: ; 755d1 (1d:55d1)
db "@"
FuchsiaGymText4: ; 755d6 (1d:55d6)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -263,7 +263,7 @@ FuchsiaGymAfterBattleText3: ; 755ea (1d:55ea)
db "@"
FuchsiaGymText5: ; 755ef (1d:55ef)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -281,7 +281,7 @@ FuchsiaGymAfterBattleText4: ; 75603 (1d:5603)
db "@"
FuchsiaGymText6: ; 75608 (1d:5608)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -299,7 +299,7 @@ FuchsiaGymAfterBattleText5: ; 7561c (1d:561c)
db "@"
FuchsiaGymText7: ; 75621 (1d:5621)
db $08 ; asm
TX_ASM
ld hl, FuchsiaGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -317,7 +317,7 @@ FuchsiaGymAfterBattleText6: ; 75635 (1d:5635)
db "@"
FuchsiaGymText8: ; 7563a (1d:563a)
db $08 ; asm
TX_ASM
ld a, [wd792]
bit 1, a
ld hl, FuchsiaGymText_75653

4
scripts/fuchsiahouse2.asm
View file

@ -9,7 +9,7 @@ FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8)
dw FuchsiaHouse2Text5
FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
db $08 ; asm
TX_ASM
ld a, [wd78e]
bit 0, a
jr nz, .subtract
@ -97,7 +97,7 @@ HM04NoRoomText: ; 7515e (1d:515e)
FuchsiaHouse2Text5: ; 75163 (1d:5163)
FuchsiaHouse2Text4: ; 75163 (1d:5163)
db $08 ; asm
TX_ASM
ldh a, [$8c]
cp $4
ld hl, FuchsiaHouse2Text_7517b

2
scripts/fuchsiahouse3.asm
View file

@ -5,7 +5,7 @@ FuchsiaHouse3TextPointers: ; 5617f (15:617f)
dw FuchsiaHouse3Text1
FuchsiaHouse3Text1: ; 56181 (15:6181)
db $08 ; asm
TX_ASM
ld a, [wd728]
bit 4, a
jr nz, .after

4
scripts/gary.asm
View file

@ -241,7 +241,7 @@ GaryTextPointers: ; 760d6 (1d:60d6)
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 @@ GaryText2: ; 76108 (1d:6108)
db "@"
GaryText3: ; 7610d (1d:610d)
db $8
TX_ASM
ld a, [W_PLAYERSTARTER]
ld [wd11e], a
call GetMonName

4
scripts/lab2.asm
View file

@ -11,13 +11,13 @@ Lab2Text1: ; 75c2a (1d:5c2a)
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)

2
scripts/lab3.asm
View file

@ -9,7 +9,7 @@ Lab3TextPointers: ; 75c8a (1d:5c8a)
dw Lab3Text5
Lab3Text1: ; 75c94 (1d:5c94)
db $08 ; asm
TX_ASM
ld a, [wd7a1]
bit 7, a
jr nz, .asm_e551a

4
scripts/lab4.asm
View file

@ -48,7 +48,7 @@ FossilsList: ; 75d68 (1d:5d68)
db $00
Lab4Text1: ; 75d6c (1d:5d6c)
db $8
TX_ASM
ld a, [wd7a3]
bit 0, a
jr nz, .asm_75d96
@ -105,7 +105,7 @@ Lab4Text_75dd5: ; 75dd5 (1d:5dd5)
db "@"
Lab4Text2: ; 75dda (1d:5dda)
db $08 ; asm
TX_ASM
ld a, $3
ld [wWhichTrade], a
predef DoInGameTradeDialogue

4
scripts/lance.asm
View file

@ -144,7 +144,7 @@ LanceTrainerHeader0: ; 5a397 (16:6397)
db $ff
LanceText1: ; 5a3a4 (16:63a4)
db $08 ; asm
TX_ASM
ld hl, LanceTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -159,7 +159,7 @@ LanceEndBattleText: ; 5a3b3 (16:63b3)
LanceAfterBattleText: ; 5a3b8 (16:63b8)
TX_FAR _LanceAfterBattleText
db $8
TX_ASM
ld hl, wd866
set 6, [hl]
jp TextScriptEnd

10
scripts/lavenderhouse1.asm
View file

@ -11,7 +11,7 @@ LavenderHouse1TextPointers: ; 1d8ac (7:58ac)
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 @@ LavenderHouse1Text_1d8d6: ; 1d8d6 (7:58d6)
db "@"
LavenderHouse1Text2: ; 1d8db (7:58db)
db $08 ; asm
TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_06470
@ -56,20 +56,20 @@ LavenderHouse1Text_1d8f9: ; 1d8f9 (7:58f9)
LavenderHouse1Text3: ; 1d8fe (7:58fe)
TX_FAR _LavenderHouse1Text3
db $8
TX_ASM
ld a, PSYDUCK
call PlayCry
jp TextScriptEnd
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

4
scripts/lavenderhouse2.asm
View file

@ -8,13 +8,13 @@ LavenderHouse2TextPointers: ; 1d9b2 (7:59b2)
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

2
scripts/lavendermart.asm
View file

@ -11,7 +11,7 @@ LavenderMartText2: ; 5c935 (17:4935)
db "@"
LavenderMartText3: ; 5c93a (17:493a)
db $08 ; asm
TX_ASM
ld a, [wd7e0]
bit 7, a
jr nz, .asm_c88d4

2
scripts/lavendertown.asm
View file

@ -13,7 +13,7 @@ LavenderTownTextPointers: ; 4410e (11:410e)
dw LavenderTownText9
LavenderTownText1: ; 44120 (11:4120)
db $08 ; asm
TX_ASM
ld hl, LavenderTownText_4413c
call PrintText
call YesNoChoice

2
scripts/lorelei.asm
View file

@ -132,7 +132,7 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255)
db $ff
LoreleiText1: ; 76262 (1d:6262)
db $08 ; asm
TX_ASM
ld hl, LoreleiTrainerHeader0
call TalkToTrainer
jp TextScriptEnd

4
scripts/mansion1.asm
View file

@ -80,7 +80,7 @@ Mansion1TrainerHeader0: ; 44334 (11:4334)
db $ff
Mansion1Text1: ; 44341 (11:4341)
db $08 ; asm
TX_ASM
ld hl, Mansion1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -98,7 +98,7 @@ Mansion1AfterBattleText2: ; 44355 (11:4355)
db "@"
Mansion1Text4: ; 4435a (11:435a)
db $8
TX_ASM
ld hl, MansionSwitchText
call PrintText
call YesNoChoice

4
scripts/mansion2.asm
View file

@ -77,7 +77,7 @@ Mansion2TrainerHeader0: ; 52057 (14:6057)
db $ff
Mansion2Text1: ; 52064 (14:6064)
db $08 ; asm
TX_ASM
ld hl, Mansion2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -104,7 +104,7 @@ Mansion2Text4: ; 52082 (14:6082)
Mansion3Text6: ; 52087 (14:6087)
Mansion2Text5: ; 52087 (14:6087)
db $8
TX_ASM
ld hl, Mansion2Text_520c2
call PrintText
call YesNoChoice

4
scripts/mansion3.asm
View file

@ -113,13 +113,13 @@ Mansion3TrainerHeader2: ; 522a2 (14:62a2)
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

4
scripts/mansion4.asm
View file

@ -92,13 +92,13 @@ Mansion4TrainerHeader2: ; 52454 (14:6454)
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

14
scripts/mtmoon1.asm
View file

@ -95,43 +95,43 @@ MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
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

14
scripts/mtmoon3.asm
View file

@ -211,7 +211,7 @@ MtMoon3TrainerHeader4: ; 49e6c (12:5e6c)
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 @@ MtMoon3Text1: ; 49e79 (12:5e79)
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 @@ MtMoon3Text_49f24: ; 49f24 (12:5f24)
db "@"
MtMoon3Text7: ; 49f29 (12:5f29)
db $08 ; asm
TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f64

2
scripts/mtmoonpokecenter.asm
View file

@ -22,7 +22,7 @@ MtMoonPokecenterText3: ; 492e7 (12:52e7)
db "@"
MtMoonPokecenterText4: ; 492ec (12:52ec)
db $08 ; asm
TX_ASM
ld a, [wd7c6]
add a
jp c, .asm_49353

10
scripts/museum1f.asm
View file

@ -39,7 +39,7 @@ Museum1FTextPointers: ; 5c12b (17:412b)
dw Museum1FText5
Museum1FText1: ; 5c135 (17:4135)
db $8
TX_ASM
ld a, [W_YCOORD]
cp $4
jr nz, .asm_8774b
@ -179,7 +179,7 @@ Museum1FText_5c242: ; 5c242 (17:4242)
db "@"
Museum1FText2: ; 5c247 (17:4247)
db $08 ; asm
TX_ASM
ld hl, Museum1FText_5c251
call PrintText
jp TextScriptEnd
@ -189,7 +189,7 @@ Museum1FText_5c251: ; 5c251 (17:4251)
db "@"
Museum1FText3: ; 5c256 (17:4256)
db $08 ; asm
TX_ASM
ld a, [wd754]
bit 1, a
jr nz, .asm_5c285
@ -231,7 +231,7 @@ Museum1FText_5c29e: ; 5c29e (17:429e)
db "@"
Museum1FText4: ; 5c2a3 (17:42a3)
db $08 ; asm
TX_ASM
ld hl, Museum1FText_5c2ad
call PrintText
jp TextScriptEnd
@ -241,7 +241,7 @@ Museum1FText_5c2ad: ; 5c2ad (17:42ad)
db "@"
Museum1FText5: ; 5c2b2 (17:42b2)
db $08 ; asm
TX_ASM
ld hl, Museum1FText_5c2bc
call PrintText
jp TextScriptEnd

2
scripts/namerater.asm
View file

@ -41,7 +41,7 @@ NameRaterTextPointers: ; 1da54 (7:5a54)
dw NameRaterText1
NameRaterText1: ; 1da56 (7:5a56)
db $8
TX_ASM
call SaveScreenTilesToBuffer2
ld hl, NameRaterText_1dab3
call NameRaterScript_1da15

34
scripts/oakslab.asm
View file

@ -734,7 +734,7 @@ OaksLabTextPointers: ; 1d082 (7:5082)
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 @@ OaksLabText41: ; 1d0fd (7:50fd)
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 @@ OaksLabText2: ; 1d102 (7:5102)
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 @@ OaksLabText3: ; 1d113 (7:5113)
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 @@ OaksLabLastMonText: ; 1d243 (7:5243)
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 @@ OaksLabText34: ; 1d322 (7:5322)
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 @@ OaksLabText8: ; 1d331 (7:5331)
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 @@ OaksLabText_1d340: ; 1d340 (7:5340)
db "@"
OaksLabText17: ; 1d345 (7:5345)
db $8
TX_ASM
ld hl, OaksLabRivalWaitingText
call PrintText
jp TextScriptEnd
@ -1090,7 +1090,7 @@ OaksLabRivalWaitingText: ; 1d34f (7:534f)
db "@"
OaksLabText18: ; 1d354 (7:5354)
db $8
TX_ASM
ld hl, OaksLabChooseMonText
call PrintText
jp TextScriptEnd
@ -1100,7 +1100,7 @@ OaksLabChooseMonText: ; 1d35e (7:535e)
db "@"
OaksLabText19: ; 1d363 (7:5363)
db $8
TX_ASM
ld hl, OaksLabRivalInterjectionText
call PrintText
jp TextScriptEnd
@ -1110,7 +1110,7 @@ OaksLabRivalInterjectionText: ; 1d36d (7:536d)
db "@"
OaksLabText20: ; 1d372 (7:5372)
db $8
TX_ASM
ld hl, OaksLabBePatientText
call PrintText
jp TextScriptEnd
@ -1120,7 +1120,7 @@ OaksLabBePatientText: ; 1d37c (7:537c)
db "@"
OaksLabText12: ; 1d381 (7:5381)
db $8
TX_ASM
ld hl, OaksLabLeavingText
call PrintText
jp TextScriptEnd
@ -1130,7 +1130,7 @@ OaksLabLeavingText: ; 1d38b (7:538b)
db "@"
OaksLabText13: ; 1d390 (7:5390)
db $8
TX_ASM
ld hl, OaksLabRivalPickingMonText
call PrintText
jp TextScriptEnd
@ -1140,7 +1140,7 @@ OaksLabRivalPickingMonText: ; 1d39a (7:539a)
db "@"
OaksLabText14: ; 1d39f (7:539f)
db $8
TX_ASM
ld hl, OaksLabRivalReceivedMonText
call PrintText
jp TextScriptEnd
@ -1150,7 +1150,7 @@ OaksLabRivalReceivedMonText: ; 1d3a9 (7:53a9)
db $11, "@"
OaksLabText15: ; 1d3af (7:53af)
db $8
TX_ASM
ld hl, OaksLabRivalChallengeText
call PrintText
jp TextScriptEnd
@ -1168,7 +1168,7 @@ OaksLabText_1d3c3: ; 1d3c3 (7:53c3)
db "@"
OaksLabText16: ; 1d3c8 (7:53c8)
db $8
TX_ASM
ld hl, OaksLabRivalToughenUpText
call PrintText
jp TextScriptEnd
@ -1209,7 +1209,7 @@ OaksLabText38: ; 1d3fb (7:53fb)
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

6
scripts/pewtercity.asm
View file

@ -194,7 +194,7 @@ PewterCityText2: ; 193ac (6:53ac)
db "@"
PewterCityText3: ; 193b1 (6:53b1)
db $08 ; asm
TX_ASM
ld hl, PewterCityText_193f1
call PrintText
call YesNoChoice
@ -240,7 +240,7 @@ PewterCityText13: ; 19400 (6:5400)
db "@"
PewterCityText4: ; 19405 (6:5405)
db $8
TX_ASM
ld hl, PewterCityText_19427
call PrintText
call YesNoChoice
@ -269,7 +269,7 @@ PewterCityText_19431: ; 19431 (6:5431)
db "@"
PewterCityText5: ; 19436 (6:5436)
db $08 ; asm
TX_ASM
ld hl, PewterCityText_1945d
call PrintText
xor a

6
scripts/pewtergym.asm
View file

@ -105,7 +105,7 @@ PewterGymTrainerHeader0: ; 5c441 (17:4441)
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 @@ PewterGymText_5c4bc: ; 5c4bc (17:44bc)
db "@"
PewterGymText2: ; 5c4c6 (17:44c6)
db $08 ; asm
TX_ASM
ld hl, PewterGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -188,7 +188,7 @@ PewterGymAfterBattleText1: ; 5c4da (17:44da)
db "@"
PewterGymText3: ; 5c4df (17:44df)
db $08 ; asm
TX_ASM
ld a, [wd72a]
bit 0, a
jr nz, .asm_5c50c

2
scripts/pewterhouse1.asm
View file

@ -8,7 +8,7 @@ PewterHouse1TextPointers: ; 1d5f6 (7:55f6)
PewterHouse1Text1: ; 1d5fc (7:55fc)
TX_FAR _PewterHouse1Text1
db $08 ; asm
TX_ASM
ld a, NIDORAN_M
call PlayCry
call WaitForSoundToFinish

4
scripts/pewtermart.asm
View file

@ -10,7 +10,7 @@ PewterMartTextPointers: ; 74cb6 (1d:4cb6)
dw PewterMartText3
PewterMartText2: ; 74cbc (1d:4cbc)
db $08 ; asm
TX_ASM
ld hl, PewterMartText_74cc6
call PrintText
jp TextScriptEnd
@ -20,7 +20,7 @@ PewterMartText_74cc6: ; 74cc6 (1d:4cc6)
db "@"
PewterMartText3: ; 74ccb (1d:4ccb)
db $08 ; asm
TX_ASM
ld hl, PewterMartText_74cd5
call PrintText
jp TextScriptEnd

2
scripts/pewterpokecenter.asm
View file

@ -16,7 +16,7 @@ PewterPokecenterText2: ; 5c596 (17:4596)
db "@"
PewterPokecenterText3: ; 5c59b (17:459b)
db $8
TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, PewterPokecenterText5

2
scripts/pokemontower2.asm
View file

@ -115,7 +115,7 @@ PokemonTower2TextPointers: ; 605db (18:45db)
dw PokemonTower2Text2
PokemonTower2Text1: ; 605df (18:45df)
db $08 ; asm
TX_ASM
ld a, [wd764]
bit 7, a
jr z, .asm_16f24

6
scripts/pokemontower3.asm
View file

@ -48,19 +48,19 @@ PokemonTower3TrainerHeader2: ; 60705 (18:4705)
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

6
scripts/pokemontower4.asm
View file

@ -51,19 +51,19 @@ PokemonTower4TrainerHeader2: ; 60833 (18:4833)
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

8
scripts/pokemontower5.asm
View file

@ -104,7 +104,7 @@ PokemonTower5Text1: ; 609da (18:49da)
db "@"
PokemonTower5Text2: ; 609df (18:49df)
db $08 ; asm
TX_ASM
ld hl, PokemonTower5TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -122,7 +122,7 @@ PokemonTower5AfterBattleText1: ; 609f3 (18:49f3)
db "@"
PokemonTower5Text3: ; 609f8 (18:49f8)
db $08 ; asm
TX_ASM
ld hl, PokemonTower5TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -140,7 +140,7 @@ PokemonTower5AfterBattleText2: ; 60a0c (18:4a0c)
db "@"
PokemonTower5Text4: ; 60a11 (18:4a11)
db $08 ; asm
TX_ASM
ld hl, PokemonTower5TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -158,7 +158,7 @@ PokemonTower5AfterBattleText3: ; 60a25 (18:4a25)
db "@"
PokemonTower5Text5: ; 60a2a (18:4a2a)
db $08 ; asm
TX_ASM
ld hl, PokemonTower5TrainerHeader3
call TalkToTrainer
jp TextScriptEnd

8
scripts/pokemontower6.asm
View file

@ -136,25 +136,25 @@ PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7)
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

6
scripts/pokemontower7.asm
View file

@ -197,19 +197,19 @@ PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f)
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

20
scripts/powerplant.asm
View file

@ -119,47 +119,47 @@ InitVoltorbBattle: ; 1e368 (7:6368)
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 @@ VoltorbBattleText: ; 1e3aa (7:63aa)
ZapdosBattleText: ; 1e3af (7:63af)
TX_FAR _ZapdosBattleText
db $8
TX_ASM
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish

12
scripts/rockethideout1.asm
View file

@ -95,38 +95,38 @@ RocketHideout1TrainerHeader5: ; 44c52 (11:4c52)
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
RocketHideout1EndBattleText6: ; 44c91 (11:4c91)
TX_FAR _RocketHideout1EndBattleText6
db $8
TX_ASM
ld hl, wd815
set 5, [hl]
ld hl, RocketHideout1Text_44c9f

2
scripts/rockethideout2.asm
View file

@ -437,7 +437,7 @@ RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)
db $ff
RocketHideout2Text1: ; 450de (11:50de)
db $08 ; asm
TX_ASM
ld hl, RocketHideout2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd

4
scripts/rockethideout3.asm
View file

@ -175,7 +175,7 @@ RocketHideout3TrainerHeader2: ; 4530e (11:530e)
db $ff
RocketHideout3Text1: ; 4531b (11:531b)
db $08 ; asm
TX_ASM
ld hl, RocketHideout3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -193,7 +193,7 @@ RocketHideout3AfterBattleTxt2: ; 4532f (11:532f)
db "@"
RocketHideout3Text2: ; 45334 (11:5334)
db $08 ; asm
TX_ASM
ld hl, RocketHideout3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd

10
scripts/rockethideout4.asm
View file

@ -119,7 +119,7 @@ RocketHideout4TrainerHeader3: ; 4552d (11:552d)
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 @@ RocketHideout4Text10: ; 45584 (11:5584)
db "@"
RocketHideout4Text2: ; 45589 (11:5589)
db $08 ; asm
TX_ASM
ld hl, RocketHideout4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -178,7 +178,7 @@ RocketHideout4AfterBattleText2: ; 4559d (11:559d)
db "@"
RocketHideout4Text3: ; 455a2 (11:55a2)
db $08 ; asm
TX_ASM
ld hl, RocketHideout4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -196,7 +196,7 @@ RocketHideout4AfterBattleText3: ; 455b6 (11:55b6)
db "@"
RocketHideout4Text4: ; 455bb (11:55bb)
db $08 ; asm
TX_ASM
ld hl, RocketHideout4TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -210,7 +210,7 @@ RocketHideout4EndBattleText4: ; 455ca (11:55ca)
db "@"
RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
db $8
TX_ASM
ld hl, RocketHideout4Text_455ec
call PrintText
ld hl, wd81b

2
scripts/rockethideoutelevator.asm
View file

@ -62,7 +62,7 @@ RocketHideoutElevatorTextPointers: ; 4576b (11:576b)
dw RocketHideoutElevatorText1
RocketHideoutElevatorText1: ; 4576d (11:576d)
db $08 ; asm
TX_ASM
ld b, LIFT_KEY
call IsItemInBag
jr z, .asm_45782

14
scripts/rocktunnel1.asm
View file

@ -89,37 +89,37 @@ RockTunnel1TrainerHeader7: ; 4454d (11:454d)
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

16
scripts/rocktunnel2.asm
View file

@ -98,49 +98,49 @@ RockTunnel2TrainerHeader8: ; 46068 (11:6068)
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

2
scripts/route1.asm
View file

@ -7,7 +7,7 @@ Route1TextPointers: ; 1cab2 (7:4ab2)
dw Route1Text3
Route1Text1: ; 1cab8 (7:4ab8)
db $08 ; asm
TX_ASM
ld hl, wd7bf
bit 0, [hl]
set 0, [hl]

12
scripts/route10.asm
View file

@ -82,7 +82,7 @@ Route10TrainerHeader5: ; 5939f (16:539f)
db $ff
Route10Text1: ; 593ac (16:53ac)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -100,7 +100,7 @@ Route10AfterBattleText1: ; 593c0 (16:53c0)
db "@"
Route10Text2: ; 593c5 (16:53c5)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -118,7 +118,7 @@ Route10AfterBattleText2: ; 593d9 (16:53d9)
db "@"
Route10Text3: ; 593de (16:53de)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -136,7 +136,7 @@ Route10AfterBattleText3: ; 593f2 (16:53f2)
db "@"
Route10Text4: ; 593f7 (16:53f7)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -154,7 +154,7 @@ Route10AfterBattleText4: ; 5940b (16:540b)
db "@"
Route10Text5: ; 59410 (16:5410)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -172,7 +172,7 @@ Route10AfterBattleText5: ; 59424 (16:5424)
db "@"
Route10Text6: ; 59429 (16:5429)
db $08 ; asm
TX_ASM
ld hl, Route10TrainerHeader5
call TalkToTrainer
jp TextScriptEnd

20
scripts/route11.asm
View file

@ -119,7 +119,7 @@ Route11TrainerHeader9: ; 594e7 (16:54e7)
db $ff
Route11Text1: ; 594f4 (16:54f4)
db $8
TX_ASM
ld hl, Route11TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -137,7 +137,7 @@ Route11AfterBattleText1: ; 59508 (16:5508)
db "@"
Route11Text2: ; 5950d (16:550d)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -155,7 +155,7 @@ Route11AfterBattleText2: ; 59521 (16:5521)
db "@"
Route11Text3: ; 59526 (16:5526)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -173,7 +173,7 @@ Route11AfterBattleText3: ; 5953a (16:553a)
db "@"
Route11Text4: ; 5953f (16:553f)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -191,7 +191,7 @@ Route11AfterBattleText4: ; 59553 (16:5553)
db "@"
Route11Text5: ; 59558 (16:5558)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -209,7 +209,7 @@ Route11AfterBattleText5: ; 5956c (16:556c)
db "@"
Route11Text6: ; 59571 (16:5571)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -227,7 +227,7 @@ Route11AfterBattleText6: ; 59585 (16:5585)
db "@"
Route11Text7: ; 5958a (16:558a)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -245,7 +245,7 @@ Route11AfterBattleText7: ; 5959e (16:559e)
db "@"
Route11Text8: ; 595a3 (16:55a3)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@ -263,7 +263,7 @@ Route11AfterBattleText8: ; 595b7 (16:55b7)
db "@"
Route11Text9: ; 595bc (16:55bc)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@ -281,7 +281,7 @@ Route11AfterBattleText9: ; 595d0 (16:55d0)
db "@"
Route11Text10: ; 595d5 (16:55d5)
db $08 ; asm
TX_ASM
ld hl, Route11TrainerHeader9
call TalkToTrainer
jp TextScriptEnd

8
scripts/route11gateupstairs.asm
View file

@ -8,7 +8,7 @@ Route11GateUpstairsTextPointers: ; 49457 (12:5457)
dw Route11GateUpstairsText4
Route11GateUpstairsText1: ; 4945f (12:545f)
db $08 ; asm
TX_ASM
xor a
ld [wWhichTrade], a
predef DoInGameTradeDialogue
@ -16,7 +16,7 @@ Route11GateUpstairsScriptEnd: ; 49469 (12:5469)
jp TextScriptEnd
Route11GateUpstairsText2: ; 4946c (12:546c)
db $8
TX_ASM
ld a, [wd7d6]
add a
jr c, .asm_4949b
@ -48,7 +48,7 @@ Route11GateUpstairsText_494a3: ; 494a3 (12:54a3)
db "@"
Route11GateUpstairsText3: ; 494a8 (12:54a8)
db $08 ; asm
TX_ASM
ld a, [wSpriteStateData1 + 9]
cp $4
jp nz, Route12GateUpstairsScript_495c9
@ -70,7 +70,7 @@ BinocularsNoSnorlaxText:
db "@"
Route11GateUpstairsText4: ; 494ce (12:54ce)
db $8
TX_ASM
ld hl, Route11GateUpstairsText_494d5
jp Route12GateUpstairsScript_495c9

14
scripts/route12.asm
View file

@ -157,7 +157,7 @@ Route12Text14: ; 596f0 (16:56f0)
db "@"
Route12Text2: ; 596f5 (16:56f5)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -175,7 +175,7 @@ Route12AfterBattleText1: ; 59709 (16:5709)
db "@"
Route12Text3: ; 5970e (16:570e)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -193,7 +193,7 @@ Route12AfterBattleText2: ; 59722 (16:5722)
db "@"
Route12Text4: ; 59727 (16:5727)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -211,7 +211,7 @@ Route12AfterBattleText3: ; 5973b (16:573b)
db "@"
Route12Text5: ; 59740 (16:5740)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -229,7 +229,7 @@ Route12AfterBattleText4: ; 59754 (16:5754)
db "@"
Route12Text6: ; 59759 (16:5759)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -247,7 +247,7 @@ Route12AfterBattleText5: ; 5976d (16:576d)
db "@"
Route12Text7: ; 59772 (16:5772)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -265,7 +265,7 @@ Route12AfterBattleText6: ; 59786 (16:5786)
db "@"
Route12Text8: ; 5978b (16:578b)
db $08 ; asm
TX_ASM
ld hl, Route12TrainerHeader6
call TalkToTrainer
jp TextScriptEnd

6
scripts/route12gateupstairs.asm
View file

@ -7,7 +7,7 @@ Route12GateUpstairsTextPointers: ; 49563 (12:5563)
dw Route12GateUpstairsText3
Route12GateUpstairsText1: ; 49569 (12:5569)
db $08 ; asm
TX_ASM
ld a, [wd7d7]
rrca
jr c, .asm_0ad3c
@ -48,7 +48,7 @@ TM39NoRoomText: ; 495ac (12:55ac)
db "@"
Route12GateUpstairsText2: ; 495b1 (12:55b1)
db $08 ; asm
TX_ASM
ld hl, Route12GateUpstairsText_495b8
jp Route12GateUpstairsScript_495c9
@ -57,7 +57,7 @@ Route12GateUpstairsText_495b8: ; 495b8 (12:55b8)
db "@"
Route12GateUpstairsText3: ; 495bd (12:55bd)
db $8
TX_ASM
ld hl, Route12GateUpstairsText_495c4
jp Route12GateUpstairsScript_495c9

2
scripts/route12house.asm
View file

@ -5,7 +5,7 @@ Route12HouseTextPointers: ; 56482 (15:6482)
dw Route12HouseText1
Route12HouseText1: ; 56484 (15:6484)
db $08 ; asm
TX_ASM
ld a, [wd728]
bit 5, a
jr nz, .asm_b4cad

20
scripts/route13.asm
View file

@ -121,7 +121,7 @@ Route13TrainerHeader10: ; 558bd (15:58bd)
db $ff
Route13Text1: ; 558ca (15:58ca)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -139,7 +139,7 @@ Route13AfterBattleText2: ; 558de (15:58de)
db "@"
Route13Text2: ; 558e3 (15:58e3)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -157,7 +157,7 @@ Route13AfterBattleText3: ; 558f7 (15:58f7)
db "@"
Route13Text3: ; 558fc (15:58fc)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -175,7 +175,7 @@ Route13AfterBattleText4: ; 55910 (15:5910)
db "@"
Route13Text4: ; 55915 (15:5915)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -193,7 +193,7 @@ Route13AfterBattleText5: ; 55929 (15:5929)
db "@"
Route13Text5: ; 5592e (15:592e)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -211,7 +211,7 @@ Route13AfterBattleText6: ; 55942 (15:5942)
db "@"
Route13Text6: ; 55947 (15:5947)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -229,7 +229,7 @@ Route13AfterBattleText7: ; 5595b (15:595b)
db "@"
Route13Text7: ; 55960 (15:5960)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@ -247,7 +247,7 @@ Route13AfterBattleText8: ; 55974 (15:5974)
db "@"
Route13Text8: ; 55979 (15:5979)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@ -265,7 +265,7 @@ Route13AfterBattleText9: ; 5598d (15:598d)
db "@"
Route13Text9: ; 55992 (15:5992)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader9
call TalkToTrainer
jp TextScriptEnd
@ -283,7 +283,7 @@ Route13AfterBattleText10: ; 559a6 (15:59a6)
db "@"
Route13Text10: ; 559ab (15:59ab)
db $08 ; asm
TX_ASM
ld hl, Route13TrainerHeader10
call TalkToTrainer
jp TextScriptEnd

20
scripts/route14.asm
View file

@ -119,7 +119,7 @@ Route14TrainerHeader9: ; 55a6e (15:5a6e)
db $ff
Route14Text1: ; 55a7b (15:5a7b)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -137,7 +137,7 @@ Route14AfterBattleText1: ; 55a8f (15:5a8f)
db "@"
Route14Text2: ; 55a94 (15:5a94)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -155,7 +155,7 @@ Route14AfterBattleText2: ; 55aa8 (15:5aa8)
db "@"
Route14Text3: ; 55aad (15:5aad)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -173,7 +173,7 @@ Route14AfterBattleText3: ; 55ac1 (15:5ac1)
db "@"
Route14Text4: ; 55ac6 (15:5ac6)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -191,7 +191,7 @@ Route14AfterBattleText4: ; 55ada (15:5ada)
db "@"
Route14Text5: ; 55adf (15:5adf)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -209,7 +209,7 @@ Route14AfterBattleText5: ; 55af3 (15:5af3)
db "@"
Route14Text6: ; 55af8 (15:5af8)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -227,7 +227,7 @@ Route14AfterBattleText6: ; 55b0c (15:5b0c)
db "@"
Route14Text7: ; 55b11 (15:5b11)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -245,7 +245,7 @@ Route14AfterBattleText7: ; 55b25 (15:5b25)
db "@"
Route14Text8: ; 55b2a (15:5b2a)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@ -263,7 +263,7 @@ Route14AfterBattleText8: ; 55b3e (15:5b3e)
db "@"
Route14Text9: ; 55b43 (15:5b43)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@ -281,7 +281,7 @@ Route14AfterBattleText9: ; 55b57 (15:5b57)
db "@"
Route14Text10: ; 55b5c (15:5b5c)
db $08 ; asm
TX_ASM
ld hl, Route14TrainerHeader9
call TalkToTrainer
jp TextScriptEnd

20
scripts/route15.asm
View file

@ -120,52 +120,52 @@ Route15TrainerHeader9: ; 5984b (16:584b)
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

4
scripts/route15gateupstairs.asm
View file

@ -6,7 +6,7 @@ Route15GateUpstairsTextPointers: ; 4964d (12:564d)
dw Route15GateUpstairsText2
Route15GateUpstairsText1: ; 49651 (12:5651)
db $8
TX_ASM
ld a, [wd7dd]
bit 0, a
jr nz, .asm_49683
@ -37,7 +37,7 @@ Route15GateUpstairsText_4968c: ; 4968c (12:568c)
db "@"
Route15GateUpstairsText2: ; 49691 (12:5691)
db $8
TX_ASM
ld hl, Route15GateUpstairsText_49698
jp Route12GateUpstairsScript_495c9

12
scripts/route16.asm
View file

@ -134,7 +134,7 @@ Route16TrainerHeader5: ; 59a0b (16:5a0b)
db $ff
Route16Text1: ; 59a18 (16:5a18)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -152,7 +152,7 @@ Route16AfterBattleText1: ; 59a2c (16:5a2c)
db "@"
Route16Text2: ; 59a31 (16:5a31)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -170,7 +170,7 @@ Route16AfterBattleText2: ; 59a45 (16:5a45)
db "@"
Route16Text3: ; 59a4a (16:5a4a)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -188,7 +188,7 @@ Route16AfterBattleText3: ; 59a5e (16:5a5e)
db "@"
Route16Text4: ; 59a63 (16:5a63)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -206,7 +206,7 @@ Route16AfterBattleText4: ; 59a77 (16:5a77)
db "@"
Route16Text5: ; 59a7c (16:5a7c)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -224,7 +224,7 @@ Route16AfterBattleText5: ; 59a90 (16:5a90)
db "@"
Route16Text6: ; 59a95 (16:5a95)
db $08 ; asm
TX_ASM
ld hl, Route16TrainerHeader5
call TalkToTrainer
jp TextScriptEnd

2
scripts/route16gate.asm
View file

@ -92,7 +92,7 @@ Route16GateTextPointers: ; 4975a (12:575a)
dw Route16GateText3
Route16GateText1: ; 49760 (12:5760)
db $08 ; asm
TX_ASM
call Route16GateScript_49755
jr z, .asm_0bdf3
ld hl, Route16GateText_4977c

8
scripts/route16gateupstairs.asm
View file

@ -8,7 +8,7 @@ Route16GateUpstairsTextPointers: ; 4980e (12:580e)
dw Route16GateUpstairsText4
Route16GateUpstairsText1: ; 49816 (12:5816)
db $08 ; asm
TX_ASM
ld hl, Route16GateUpstairsText_49820
call PrintText
jp TextScriptEnd
@ -18,7 +18,7 @@ Route16GateUpstairsText_49820: ; 49820 (12:5820)
db "@"
Route16GateUpstairsText2: ; 49825 (12:5825)
db $08 ; asm
TX_ASM
ld hl, Route16GateUpstairsText_4982f
call PrintText
jp TextScriptEnd
@ -28,7 +28,7 @@ Route16GateUpstairsText_4982f: ; 4982f (12:582f)
db "@"
Route16GateUpstairsText3: ; 49834 (12:5834)
db $8
TX_ASM
ld hl, Route16GateUpstairsText_4983b
jp Route12GateUpstairsScript_495c9
@ -37,7 +37,7 @@ Route16GateUpstairsText_4983b: ; 4983b (12:583b)
db "@"
Route16GateUpstairsText4: ; 49840 (12:5840)
db $8
TX_ASM
ld hl, Route16GateUpstairsText_49847
jp Route12GateUpstairsScript_495c9

4
scripts/route16house.asm
View file

@ -6,7 +6,7 @@ Route16HouseTextPointers: ; 1e5fb (7:65fb)
dw Route16HouseText2
Route16HouseText1: ; 1e5ff (7:65ff)
db $08 ; asm
TX_ASM
ld a, [wd7e0]
bit 6, a
ld hl, HM02ExplanationText
@ -43,7 +43,7 @@ HM02NoRoomText: ; 1e63b (7:663b)
db "@"
Route16HouseText2: ; 1e640 (7:6640)
db $08 ; asm
TX_ASM
ld hl, Route16HouseText_1e652
call PrintText
ld a, FEAROW

20
scripts/route17.asm
View file

@ -124,7 +124,7 @@ Route17TrainerHeader9: ; 55c1f (15:5c1f)
db $ff
Route17Text1: ; 55c2c (15:5c2c)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -142,7 +142,7 @@ Route17AfterBattleText1: ; 55c40 (15:5c40)
db "@"
Route17Text2: ; 55c45 (15:5c45)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -160,7 +160,7 @@ Route17AfterBattleText2: ; 55c59 (15:5c59)
db "@"
Route17Text3: ; 55c5e (15:5c5e)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
@ -178,7 +178,7 @@ Route17AfterBattleText3: ; 55c72 (15:5c72)
db "@"
Route17Text4: ; 55c77 (15:5c77)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
@ -196,7 +196,7 @@ Route17AfterBattleText4: ; 55c8b (15:5c8b)
db "@"
Route17Text5: ; 55c90 (15:5c90)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
@ -214,7 +214,7 @@ Route17AfterBattleText5: ; 55ca4 (15:5ca4)
db "@"
Route17Text6: ; 55ca9 (15:5ca9)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
@ -232,7 +232,7 @@ Route17AfterBattleText6: ; 55cbd (15:5cbd)
db "@"
Route17Text7: ; 55cc2 (15:5cc2)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
@ -250,7 +250,7 @@ Route17AfterBattleText7: ; 55cd6 (15:5cd6)
db "@"
Route17Text8: ; 55cdb (15:5cdb)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
@ -268,7 +268,7 @@ Route17AfterBattleText8: ; 55cef (15:5cef)
db "@"
Route17Text9: ; 55cf4 (15:5cf4)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
@ -286,7 +286,7 @@ Route17AfterBattleText9: ; 55d08 (15:5d08)
db "@"
Route17Text10: ; 55d0d (15:5d0d)
db $08 ; asm
TX_ASM
ld hl, Route17TrainerHeader9
call TalkToTrainer
jp TextScriptEnd

6
scripts/route18.asm
View file

@ -50,7 +50,7 @@ Route18TrainerHeader2: ; 59b02 (16:5b02)
db $ff
Route18Text1: ; 59b0f (16:5b0f)
db $08 ; asm
TX_ASM
ld hl, Route18TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
@ -68,7 +68,7 @@ Route18AfterBattleText1: ; 59b23 (16:5b23)
db "@"
Route18Text2: ; 59b28 (16:5b28)
db $08 ; asm
TX_ASM
ld hl, Route18TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
@ -86,7 +86,7 @@ Route18AfterBattleText2: ; 59b3c (16:5b3c)
db "@"
Route18Text3: ; 59b41 (16:5b41)
db $08 ; asm
TX_ASM
ld hl, Route18TrainerHeader2
call TalkToTrainer
jp TextScriptEnd

2
scripts/route18gate.asm
View file

@ -87,7 +87,7 @@ Route18GateTextPointers: ; 4990d (12:590d)
dw Route18GateText2
Route18GateText1: ; 49911 (12:5911)
db $08 ; asm
TX_ASM
call Route16GateScript_49755
jr z, .asm_3c84d
ld hl, Route18GateText_4992d

Some files were not shown because too many files have changed in this diff Show more