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/core.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle_anims/core.asm')
| -rw-r--r-- | engine/battle_anims/core.asm | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index 11578f7f0..0f3bb8488 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -1,4 +1,4 @@ -QueueBattleAnimation: ; cc9a1 (33:49a1) +QueueBattleAnimation: ld hl, wActiveAnimObjects ld e, 10 .loop @@ -20,15 +20,13 @@ QueueBattleAnimation: ; cc9a1 (33:49a1) call InitBattleAnimation ret -DeinitBattleAnimation: ; cc9bd +DeinitBattleAnimation: ld hl, BATTLEANIMSTRUCT_INDEX add hl, bc ld [hl], $0 ret -; cc9c4 - -InitBattleAnimation: ; cc9c4 (33:49c4) +InitBattleAnimation: ld a, [wBattleAnimTemp0] ld e, a ld d, 0 @@ -79,7 +77,7 @@ endr ld [hl], a ; 10 ret -BattleAnimOAMUpdate: ; cca09 +BattleAnimOAMUpdate: call InitBattleAnimBuffer call GetBattleAnimFrame cp -3 @@ -191,9 +189,7 @@ BattleAnimOAMUpdate: ; cca09 scf ret -; ccaaa - -InitBattleAnimBuffer: ; ccaaa +InitBattleAnimBuffer: ld hl, BATTLEANIMSTRUCT_01 add hl, bc ld a, [hl] @@ -276,9 +272,7 @@ InitBattleAnimBuffer: ; ccaaa ld [wBattleAnimTempXOffset], a ret -; ccb31 - -GetBattleAnimTileOffset: ; ccb31 (33:4b31) +GetBattleAnimTileOffset: push hl push bc ld hl, wBattleAnimTileDict @@ -301,14 +295,10 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31) pop hl ret -_ExecuteBGEffects: ; ccb48 +_ExecuteBGEffects: callfar ExecuteBGEffects ret -; ccb4f - -_QueueBGEffect: ; ccb4f (33:4b4f) +_QueueBGEffect: callfar QueueBGEffect ret - -; ccb56 (33:4b56) |