More TX_ASM

This commit is contained in:
U-Daniel-PC\Daniel 2015-07-03 22:49:20 -05:00
parent ec4c535593
commit bc6f0bc08a
5 changed files with 12 additions and 12 deletions

View file

@ -11,7 +11,7 @@ BeachHouseTextPointers:
dw BeachHouseSign4Text dw BeachHouseSign4Text
SurfinDudeText: SurfinDudeText:
db 8 TX_ASM
ld a,[$d471] ld a,[$d471]
bit 6,a bit 6,a
jr nz,.next jr nz,.next
@ -61,7 +61,7 @@ SurfinDudeText:
db "@" db "@"
BeachHousePikachuText: BeachHousePikachuText:
db 8 TX_ASM
ld hl,.BeachHousePikachuText ld hl,.BeachHousePikachuText
call PrintText call PrintText
ld a,PIKACHU ld a,PIKACHU
@ -74,7 +74,7 @@ BeachHousePikachuText:
db "@" db "@"
BeachHouseSign1Text: BeachHouseSign1Text:
db 8 TX_ASM
ld hl,.BeachHouseSign1Text2 ld hl,.BeachHouseSign1Text2
ld a,[$d471] ld a,[$d471]
bit 6,a bit 6,a
@ -92,7 +92,7 @@ BeachHouseSign1Text:
db "@" db "@"
BeachHouseSign2Text: BeachHouseSign2Text:
db 8 TX_ASM
ld hl,.BeachHouseSign2Text2 ld hl,.BeachHouseSign2Text2
ld a,[$d471] ld a,[$d471]
bit 6,a bit 6,a
@ -110,7 +110,7 @@ BeachHouseSign2Text:
db "@" db "@"
BeachHouseSign3Text: BeachHouseSign3Text:
db 8 TX_ASM
ld hl,.BeachHouseSign3Text2 ld hl,.BeachHouseSign3Text2
ld a,[$d471] ld a,[$d471]
bit 6,a bit 6,a
@ -128,7 +128,7 @@ BeachHouseSign3Text:
db "@" db "@"
BeachHouseSign4Text: BeachHouseSign4Text:
db 8 TX_ASM
ld a,1 ld a,1
ld [$cc3c],a ld [$cc3c],a
ld a,[$d471] ld a,[$d471]

View file

@ -26,7 +26,7 @@ BluesHouseTextPointers: ; 19b57 (6:5b57)
dw BluesHouseText3 dw BluesHouseText3
BluesHouseText1: ; 19b5d (6:5b5d) BluesHouseText1: ; 19b5d (6:5b5d)
db 8 TX_ASM
ld a,[wd74a] ld a,[wd74a]
bit 0,a bit 0,a
jr nz,.GotMap jr nz,.GotMap

View file

@ -166,7 +166,7 @@ PalletTownTextPointers: ; 18f88 (6:4f88)
dw PalletTownText7 dw PalletTownText7
PalletTownText1: ; 18f96 (6:4f96) PalletTownText1: ; 18f96 (6:4f96)
db 8 TX_ASM
ld a,[wcf0d] ld a,[wcf0d]
and a and a
jr nz,.next jr nz,.next
@ -182,7 +182,7 @@ PalletTownText1: ; 18f96 (6:4f96)
OakAppearsText: ; 18fb0 (6:4fb0) OakAppearsText: ; 18fb0 (6:4fb0)
TX_FAR _OakAppearsText TX_FAR _OakAppearsText
db 8 TX_ASM
ld c,10 ld c,10
call DelayFrames call DelayFrames
xor a xor a

View file

@ -215,7 +215,7 @@ PokemonTower7Text3: ; 60e80 (18:4e80)
jp TextScriptEnd jp TextScriptEnd
PokemonTower7FujiText: PokemonTower7FujiText:
db 8 ; asm TX_ASM
ld hl, TowerRescueFujiText ld hl, TowerRescueFujiText
call PrintText call PrintText
ld hl, wd7e0 ld hl, wd7e0

View file

@ -6,7 +6,7 @@ RedsHouse1FTextPointers: ; 4816b (12:416b)
dw RedsHouse1FText2 dw RedsHouse1FText2
RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom
db 8 TX_ASM
ld a, [wd72e] ld a, [wd72e]
bit 3, a bit 3, a
jr nz, .heal ; if player has received a Pokémon from Oak, heal team jr nz, .heal ; if player has received a Pokémon from Oak, heal team
@ -50,7 +50,7 @@ MomHealText2: ; 481c1 (12:41c1)
db "@" db "@"
RedsHouse1FText2: ; 0x481c6 TV RedsHouse1FText2: ; 0x481c6 TV
db 8 TX_ASM
ld a,[wSpriteStateData1 + 9] ld a,[wSpriteStateData1 + 9]
cp 4 cp 4
ld hl,TVWrongSideText ld hl,TVWrongSideText