diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/battle_anims/helpers.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle_anims/helpers.asm')
| -rw-r--r-- | engine/battle_anims/helpers.asm | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 0a00b65a4..63177b1b1 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -1,4 +1,4 @@ -ReinitBattleAnimFrameset: ; ce7bf (33:67bf) +ReinitBattleAnimFrameset: ld hl, BATTLEANIMSTRUCT_FRAMESET_ID add hl, bc ld [hl], a @@ -10,7 +10,7 @@ ReinitBattleAnimFrameset: ; ce7bf (33:67bf) ld [hl], -1 ret -GetBattleAnimFrame: ; ce7d1 +GetBattleAnimFrame: .loop ld hl, BATTLEANIMSTRUCT_DURATION add hl, bc @@ -72,9 +72,7 @@ GetBattleAnimFrame: ; ce7d1 ld [hl], a jr .loop -; ce823 - -.GetPointer: ; ce823 +.GetPointer: ld hl, BATTLEANIMSTRUCT_FRAMESET_ID add hl, bc ld e, [hl] @@ -93,9 +91,7 @@ GetBattleAnimFrame: ; ce7d1 add hl, de ret -; ce83c - -GetBattleAnimOAMPointer: ; ce83c +GetBattleAnimOAMPointer: ld l, a ld h, 0 ld de, BattleAnimOAMData @@ -104,9 +100,7 @@ GetBattleAnimOAMPointer: ; ce83c add hl, de ret -; ce846 - -LoadBattleAnimObj: ; ce846 (33:6846) +LoadBattleAnimObj: push hl ld l, a ld h, 0 @@ -126,5 +120,3 @@ LoadBattleAnimObj: ; ce846 (33:6846) call DecompressRequest2bpp pop bc ret - -; ce85e (33:685e) |