diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
| commit | 7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch) | |
| tree | 89b4000a56c9e3d942666639c83416100f360f88 /engine/trade.asm | |
| parent | 80bae03975a84dadf080c79f52216866dd410cf8 (diff) | |
| parent | fc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/trade.asm')
| -rwxr-xr-x | engine/trade.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/trade.asm b/engine/trade.asm index 78444cf6..c3913a7e 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -305,7 +305,7 @@ Trade_AnimateBallEnteringLinkCable: ld [rOBP0], a xor a ld [wLinkCableAnimBulgeToggle], a - ld bc, $2060 + lb bc, $20, $60 .moveBallInsideLinkCableLoop push bc xor a @@ -380,7 +380,7 @@ Trade_AnimLeftToRight: call Trade_InitGameboyTransferGfx ld a, $1 ld [wTradedMonMovingRight], a - ld a, $e4 + ld a, %11100100 ld [rOBP0], a ld a, $54 ld [wBaseCoordX], a @@ -466,7 +466,7 @@ Trade_DrawLeftGameboy: ld a, $5d ld [hli], a ld a, $5e - ld c, $8 + ld c, 8 .loop ld [hli], a dec c @@ -526,8 +526,8 @@ Trade_DrawRightGameboy: ; draw text box with enemy name above link cable coord hl, 6, 0 - ld b, $2 - ld c, $7 + ld b, 2 + ld c, 7 call TextBoxBorder coord hl, 7, 2 ld de, wLinkEnemyTrainerName |