summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 22:49:20 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 22:49:20 -0500
commitbc6f0bc08a73a4afafc24d5349d56108d3971e2a (patch)
treeab137388ede9e79dc489271fec17e4692b81e17e
parentec4c53559379f3bf7bd332905ba144e1d998f38b (diff)
More TX_ASM
-rw-r--r--scripts/beach_house.asm12
-rwxr-xr-xscripts/blueshouse.asm2
-rwxr-xr-xscripts/pallettown.asm4
-rwxr-xr-xscripts/pokemontower7.asm2
-rwxr-xr-xscripts/redshouse1f.asm4
5 files changed, 12 insertions, 12 deletions
diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
index 67c29f1b..d6112df7 100644
--- a/scripts/beach_house.asm
+++ b/scripts/beach_house.asm
@@ -11,7 +11,7 @@ BeachHouseTextPointers:
dw BeachHouseSign4Text
SurfinDudeText:
- db 8
+ TX_ASM
ld a,[$d471]
bit 6,a
jr nz,.next
@@ -61,7 +61,7 @@ SurfinDudeText:
db "@"
BeachHousePikachuText:
- db 8
+ TX_ASM
ld hl,.BeachHousePikachuText
call PrintText
ld a,PIKACHU
@@ -74,7 +74,7 @@ BeachHousePikachuText:
db "@"
BeachHouseSign1Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign1Text2
ld a,[$d471]
bit 6,a
@@ -92,7 +92,7 @@ BeachHouseSign1Text:
db "@"
BeachHouseSign2Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign2Text2
ld a,[$d471]
bit 6,a
@@ -110,7 +110,7 @@ BeachHouseSign2Text:
db "@"
BeachHouseSign3Text:
- db 8
+ TX_ASM
ld hl,.BeachHouseSign3Text2
ld a,[$d471]
bit 6,a
@@ -128,7 +128,7 @@ BeachHouseSign3Text:
db "@"
BeachHouseSign4Text:
- db 8
+ TX_ASM
ld a,1
ld [$cc3c],a
ld a,[$d471]
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index ab05e286..5d6f1f83 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -26,7 +26,7 @@ BluesHouseTextPointers: ; 19b57 (6:5b57)
dw BluesHouseText3
BluesHouseText1: ; 19b5d (6:5b5d)
- db 8
+ TX_ASM
ld a,[wd74a]
bit 0,a
jr nz,.GotMap
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index c615107c..c05b87c1 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -166,7 +166,7 @@ PalletTownTextPointers: ; 18f88 (6:4f88)
dw PalletTownText7
PalletTownText1: ; 18f96 (6:4f96)
- db 8
+ TX_ASM
ld a,[wcf0d]
and a
jr nz,.next
@@ -182,7 +182,7 @@ PalletTownText1: ; 18f96 (6:4f96)
OakAppearsText: ; 18fb0 (6:4fb0)
TX_FAR _OakAppearsText
- db 8
+ TX_ASM
ld c,10
call DelayFrames
xor a
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index a5d10ca8..4462fb78 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -215,7 +215,7 @@ PokemonTower7Text3: ; 60e80 (18:4e80)
jp TextScriptEnd
PokemonTower7FujiText:
- db 8 ; asm
+ TX_ASM
ld hl, TowerRescueFujiText
call PrintText
ld hl, wd7e0
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm
index d00ee9de..b630fffe 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -6,7 +6,7 @@ RedsHouse1FTextPointers: ; 4816b (12:416b)
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 @@ MomHealText2: ; 481c1 (12:41c1)
db "@"
RedsHouse1FText2: ; 0x481c6 TV
- db 8
+ TX_ASM
ld a,[wSpriteStateData1 + 9]
cp 4
ld hl,TVWrongSideText