diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-05 16:17:47 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-05 16:17:47 -0500 |
| commit | c3911c80cf8400f81518532c13912c647b81b880 (patch) | |
| tree | fd6feac2d6e5355ceb24c793b4567fdaa7ce5e24 /engine/trade.asm | |
| parent | bankB misc functions (diff) | |
| download | pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.tar.gz pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.tar.xz pokeyellow-c3911c80cf8400f81518532c13912c647b81b880.zip | |
BankD misc functions
Game Corner stuff and (unused) titlescreen2.asm
Diffstat (limited to 'engine/trade.asm')
| -rwxr-xr-x | engine/trade.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/trade.asm b/engine/trade.asm index 8887877b..2638835b 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -383,9 +383,9 @@ Trade_AnimLeftToRight: ; 41376 (10:5376) ld a, $e4 ld [rOBP0], a ld a, $54 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $1c - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, [wLeftGBMonSpecies] ld [wMonPartySpriteSpecies], a call Trade_WriteCircledMonOAM @@ -415,9 +415,9 @@ Trade_AnimRightToLeft: ; 413c6 (10:53c6) xor a ld [wTradedMonMovingRight], a ld a, $64 - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, $44 - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld a, [wRightGBMonSpecies] ld [wMonPartySpriteSpecies], a call Trade_WriteCircledMonOAM @@ -622,10 +622,10 @@ Trade_AddOffsetsToOAMCoords: ; 41510 (10:5510) ld hl, wOAMBuffer ld c, $14 .loop - ld a, [W_BASECOORDY] + ld a, [wBaseCoordY] add [hl] ld [hli], a - ld a, [W_BASECOORDX] + ld a, [wBaseCoordX] add [hl] ld [hli], a inc hl @@ -657,9 +657,9 @@ Trade_AnimMonMoveVertical: ; 41525 (10:5525) lb bc, -4, 0 ; move left .doAnim ld a, b - ld [W_BASECOORDX], a + ld [wBaseCoordX], a ld a, c - ld [W_BASECOORDY], a + ld [wBaseCoordY], a ld d, $4 .loop call Trade_AddOffsetsToOAMCoords |