summaryrefslogtreecommitdiff
path: root/scripts/TradeCenter.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/TradeCenter.asm
parent53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
Sync with pokered
Diffstat (limited to 'scripts/TradeCenter.asm')
-rw-r--r--scripts/TradeCenter.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/TradeCenter.asm b/scripts/TradeCenter.asm
index ddb3061e..dbed79c1 100644
--- a/scripts/TradeCenter.asm
+++ b/scripts/TradeCenter.asm
@@ -1,38 +1,38 @@
TradeCenter_Script:
call EnableAutoTextBoxDrawing
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ld a, SPRITE_FACING_LEFT
jr z, .next
ld a, SPRITE_FACING_RIGHT
.next
- ld [hSpriteFacingDirection], a
+ ldh [hSpriteFacingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ldh [hSpriteIndex], a
call SetSpriteFacingDirection
ld hl, wd72d
bit 0, [hl]
set 0, [hl]
ret nz
- ld hl, wSpriteStateData2 + $14
- ld a, $8
+ ld hl, wSprite01StateData2MapY
+ ld a, 8 ; y
ld [hli], a
- ld a, $a
+ ld a, 10 ; x
ld [hl], a
ld a, SPRITE_FACING_LEFT
- ld [wSpriteStateData1 + $19], a
- ld a, [hSerialConnectionStatus]
+ ld [wSprite01StateData1FacingDirection], a
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ret z
- ld a, $7
- ld [wSpriteStateData2 + $15], a
+ ld a, 7 ; x
+ ld [wSprite01StateData2MapX], a
ld a, SPRITE_FACING_RIGHT
- ld [wSpriteStateData1 + $19], a
+ ld [wSprite01StateData1FacingDirection], a
ret
TradeCenter_TextPointers:
dw TradeCenterText1
TradeCenterText1:
- TX_FAR _TradeCenterText1
- db "@"
+ text_far _TradeCenterText1
+ text_end