diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle_anims/engine.asm | 8 | ||||
| -rwxr-xr-x | engine/battle_anims/helpers.asm | 8 | ||||
| -rwxr-xr-x | engine/sprites.asm | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle_anims/engine.asm b/engine/battle_anims/engine.asm index ae3bdde28..55adeae8c 100755 --- a/engine/battle_anims/engine.asm +++ b/engine/battle_anims/engine.asm @@ -88,7 +88,7 @@ BattleAnimOAMUpdate: ; cca09 jp z, .delete push af ld hl, wBattleAnimTempOAMFlags - ld a, [wBattleAnimTemp7] + ld a, [wBattleAnimTempAddSubFlags] xor [hl] and $e0 ld [hl], a @@ -200,7 +200,7 @@ InitBattleAnimBuffer: ; ccaaa and %10000000 ld [wBattleAnimTempOAMFlags], a xor a - ld [wBattleAnimTemp7], a + ld [wBattleAnimTempAddSubFlags], a ld hl, BATTLEANIMSTRUCT_PALETTE add hl, bc ld a, [hl] @@ -208,7 +208,7 @@ InitBattleAnimBuffer: ; ccaaa ld hl, BATTLEANIMSTRUCT_02 add hl, bc ld a, [hl] - ld [wBattleAnimTemp1], a + ld [wBattleAnimTempField02], a ld hl, BATTLEANIMSTRUCT_TILEID add hl, bc ld a, [hli] @@ -239,7 +239,7 @@ InitBattleAnimBuffer: ; ccaaa ld [wBattleAnimTempXCoord], a ld a, [hli] ld d, a - ld a, [wBattleAnimTemp1] + ld a, [wBattleAnimTempField02] cp $ff jr nz, .check_kinesis_softboiled_milkdrink ld a, 5 * 8 diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index a692211d3..0a00b65a4 100755 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -29,10 +29,11 @@ GetBattleAnimFrame: ; ce7d1 inc [hl] call .GetPointer ld a, [hli] - cp -2 + cp dorestart_command jr z, .restart - cp -1 + cp endanim_command jr z, .repeat_last + push af ld a, [hl] push hl @@ -41,12 +42,11 @@ GetBattleAnimFrame: ; ce7d1 add hl, bc ld [hl], a pop hl - .okay ld a, [hl] and $c0 srl a - ld [wBattleAnimTemp7], a + ld [wBattleAnimTempAddSubFlags], a pop af ret diff --git a/engine/sprites.asm b/engine/sprites.asm index b52c9642b..4a33eb5cf 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -444,9 +444,9 @@ GetSpriteAnimFrame: ; 8d132 inc [hl] call .GetPointer ; load pointer from SpriteAnimFrameData ld a, [hli] - cp -2 + cp dorestart_command jr z, .restart - cp -1 + cp endanim_command jr z, .repeat_last push af |