diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-09 17:44:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 17:44:09 -0500 |
| commit | e025ab9db0b85cadb42e9b72ac408a58f8133672 (patch) | |
| tree | ff74fb06f4d6715bec8a711e31f41057d4625bb3 /engine/battle_anims/core.asm | |
| parent | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (diff) | |
| parent | fd1fa78ffe78c9101c0ae5a1ca299d4282462ecd (diff) | |
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
Diffstat (limited to 'engine/battle_anims/core.asm')
| -rw-r--r-- | engine/battle_anims/core.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index 541de6fc7..b71303afc 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -27,7 +27,7 @@ DeinitBattleAnimation: ret InitBattleAnimation: - ld a, [wBattleAnimTemp0] + ld a, [wBattleObjectTempID] ld e, a ld d, 0 ld hl, BattleAnimObjects @@ -58,14 +58,14 @@ endr ld a, [de] call GetBattleAnimTileOffset ld [hli], a ; Tile ID - ld a, [wBattleAnimTemp1] + ld a, [wBattleObjectTempXCoord] ld [hli], a ; X Coord - ld a, [wBattleAnimTemp2] + ld a, [wBattleObjectTempYCoord] ld [hli], a ; Y Coord xor a ld [hli], a ; X Offset ld [hli], a ; Y Offset - ld a, [wBattleAnimTemp3] + ld a, [wBattleObjectTemp0b] ld [hli], a ; 0b xor a ld [hli], a ; 0c @@ -147,7 +147,7 @@ BattleAnimOAMUpdate: inc hl inc de ld a, [wBattleAnimTempTileID] - add $31 + add BATTLEANIM_BASE_TILE add [hl] ld [de], a inc hl |