ref: bc6f0bc08a73a4afafc24d5349d56108d3971e2a
parent: ec4c53559379f3bf7bd332905ba144e1d998f38b
author: U-Daniel-PC\Daniel <corrnondacqb@yahoo.com>
date: Fri Jul 3 18:49:20 EDT 2015
More TX_ASM
--- a/scripts/beach_house.asm
+++ b/scripts/beach_house.asm
@@ -11,7 +11,7 @@
dw BeachHouseSign4Text
SurfinDudeText:
- db 8
+ TX_ASM
ld a,[$d471]
bit 6,a
jr nz,.next
@@ -61,7 +61,7 @@
db "@"
BeachHousePikachuText:
- db 8
+ TX_ASM
ld hl,.BeachHousePikachuText
call PrintText
ld a,PIKACHU
@@ -74,7 +74,7 @@
db "@"
BeachHouseSign1Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign1Text2
ld a,[$d471]
bit 6,a
@@ -92,7 +92,7 @@
db "@"
BeachHouseSign2Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign2Text2
ld a,[$d471]
bit 6,a
@@ -110,7 +110,7 @@
db "@"
BeachHouseSign3Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign3Text2
ld a,[$d471]
bit 6,a
@@ -128,7 +128,7 @@
db "@"
BeachHouseSign4Text:
- db 8
+ TX_ASM
ld a,1
ld [$cc3c],a
ld a,[$d471]
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -26,7 +26,7 @@
dw BluesHouseText3
BluesHouseText1: ; 19b5d (6:5b5d)
- db 8
+ TX_ASM
ld a,[wd74a]
bit 0,a
jr nz,.GotMap
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -166,7 +166,7 @@
dw PalletTownText7
PalletTownText1: ; 18f96 (6:4f96)
- db 8
+ TX_ASM
ld a,[wcf0d]
and a
jr nz,.next
@@ -182,7 +182,7 @@
OakAppearsText: ; 18fb0 (6:4fb0)
TX_FAR _OakAppearsText
- db 8
+ TX_ASM
ld c,10
call DelayFrames
xor a
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -215,7 +215,7 @@
jp TextScriptEnd
PokemonTower7FujiText:
- db 8 ; asm
+ TX_ASM
ld hl, TowerRescueFujiText
call PrintText
ld hl, wd7e0
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -6,7 +6,7 @@
dw RedsHouse1FText2
RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom
- db 8
+ TX_ASM
ld a, [wd72e]
bit 3, a
jr nz, .heal ; if player has received a Pokémon from Oak, heal team
@@ -50,7 +50,7 @@
db "@"
RedsHouse1FText2: ; 0x481c6 TV
- db 8
+ TX_ASM
ld a,[wSpriteStateData1 + 9]
cp 4
ld hl,TVWrongSideText