diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/battle_anims/functions.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/battle_anims/functions.asm')
| -rwxr-xr-x | engine/battle_anims/functions.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 5e85ffdb0..e747feeef 100755 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -428,9 +428,9 @@ GetBallAnimPal: ; cd249 (33:5249) ld hl, BallColors ld a, [rSVBK] push af - ld a, BANK(CurItem) + ld a, BANK(wCurItem) ld [rSVBK], a - ld a, [CurItem] + ld a, [wCurItem] ld e, a pop af ld [rSVBK], a @@ -1611,7 +1611,7 @@ Functioncd913: ; cd913 (33:5913) ld hl, BATTLEANIMSTRUCT_10 add hl, bc ld e, [hl] - ld hl, hPushOAM ; $ff80 + ld hl, hTransferVirtualOAM ; $ff80 add hl, de ld e, l ld d, h @@ -2104,7 +2104,7 @@ asm_cdbfa: ; cdbfa (33:5bfa) ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld e, [hl] - ld hl, hPushOAM ; $ff80 + ld hl, hTransferVirtualOAM ; $ff80 add hl, de ld e, l ld d, h @@ -3332,7 +3332,7 @@ Functionce306: ; ce306 (33:6306) ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld e, [hl] - ld hl, hPushOAM ; $ff80 + ld hl, hTransferVirtualOAM ; $ff80 add hl, de ld e, l ld d, h |