diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/TradeCenter.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rw-r--r-- | scripts/TradeCenter.asm (renamed from scripts/tradecenter.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/tradecenter.asm b/scripts/TradeCenter.asm index a200e719..ddb3061e 100644 --- a/scripts/tradecenter.asm +++ b/scripts/TradeCenter.asm @@ -1,7 +1,7 @@ -TradeCenterScript: +TradeCenter_Script: call EnableAutoTextBoxDrawing - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ld a, SPRITE_FACING_LEFT jr z, .next ld a, SPRITE_FACING_RIGHT @@ -21,8 +21,8 @@ TradeCenterScript: ld [hl], a ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + $19], a - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ret z ld a, $7 ld [wSpriteStateData2 + $15], a @@ -30,7 +30,7 @@ TradeCenterScript: ld [wSpriteStateData1 + $19], a ret -TradeCenterTextPointers: +TradeCenter_TextPointers: dw TradeCenterText1 TradeCenterText1: |