summaryrefslogtreecommitdiff
path: root/scripts/beach_house.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
commitd2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch)
treef581489b522fc647477d7b36dee072d553c44fd1 /scripts/beach_house.asm
parent3394d8320f35f524231aa13bd9cae34e22246a6d (diff)
parent1a987d1e1ab96ca9553d4253c72858057332a03a (diff)
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'scripts/beach_house.asm')
-rw-r--r--scripts/beach_house.asm12
1 files changed, 6 insertions, 6 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]