diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-02-16 13:23:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 13:23:17 -0500 |
| commit | 771d2efd6569036531d69cf79d9b5aa163341cfc (patch) | |
| tree | fa65e8ed3dd12fe580d26c736ead1ea7ef4b089e /engine/battle_anims/helpers.asm | |
| parent | f9a60cff7a9451e2e8c3bb5db95d89fdba3bf000 (diff) | |
| parent | 7d6befa1816110c5518292d4c7cb8841a355dc79 (diff) | |
Merge pull request #601 from mid-kid/master
Exciting adventures down battle animation street!
Diffstat (limited to 'engine/battle_anims/helpers.asm')
| -rw-r--r-- | engine/battle_anims/helpers.asm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 4a7f2950c..64d43f032 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -37,16 +37,16 @@ GetBattleAnimFrame: push af ld a, [hl] push hl - and $3f + and (Y_FLIP << 1 | X_FLIP << 1) ^ $ff ld hl, BATTLEANIMSTRUCT_DURATION add hl, bc ld [hl], a pop hl .okay ld a, [hl] - and $c0 + and Y_FLIP << 1 | X_FLIP << 1 ; The << 1 is compensated in the "frame" macro srl a - ld [wBattleAnimTempAddSubFlags], a + ld [wBattleAnimTempFrameOAMFlags], a pop af ret @@ -55,6 +55,7 @@ GetBattleAnimFrame: ld hl, BATTLEANIMSTRUCT_DURATION add hl, bc ld [hl], a + ld hl, BATTLEANIMSTRUCT_FRAME add hl, bc dec [hl] |