diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:01:13 +0000 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:04:40 +0000 |
| commit | 68b8291b1920bcae99750f4bb97b7c01b73f786c (patch) | |
| tree | 134e5ee49f29c266789de1d00ce679b78153e891 /src/engine/bank01.asm | |
| parent | dc57997f0e3268e6c9a621429f01c55a96e21bc8 (diff) | |
| parent | ab9b857e68af66e8bc37628bd76dbba337971a15 (diff) | |
Merge branch 'anims' of https://github.com/ElectroDeoxys/poketcg
Diffstat (limited to 'src/engine/bank01.asm')
| -rw-r--r-- | src/engine/bank01.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 4936cbc..03c5e96 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -218,7 +218,7 @@ MainDuelLoop: ; 40ee (1:40ee) ldtx hl, LostDuelText .handle_duel_finished - call Func_3b6a + call PlayDuelAnimation ld a, c call PlaySong ld a, OPPONENT_TURN @@ -1523,7 +1523,7 @@ PlayTurnDuelistDrawAnimation: ; 49a8 (1:49a8) ld e, DUEL_ANIM_OPP_DRAW .got_duelist ld a, e - call Func_3b6a + call PlayDuelAnimation .loop_anim call DoFrame @@ -2229,11 +2229,11 @@ PlayShuffleAndDrawCardsAnimation: ; 4e98 (1:4e98) ld hl, sp+$03 ; play animation 3 times ld a, [hl] - call Func_3b6a + call PlayDuelAnimation ld a, [hl] - call Func_3b6a + call PlayDuelAnimation ld a, [hl] - call Func_3b6a + call PlayDuelAnimation .loop_shuffle_anim call DoFrame @@ -2255,7 +2255,7 @@ PlayShuffleAndDrawCardsAnimation: ; 4e98 (1:4e98) ; get the draw animation from input value of c ld hl, sp+$00 ld a, [hl] - call Func_3b6a + call PlayDuelAnimation .loop_drawing_anim call DoFrame @@ -2328,11 +2328,11 @@ Func_4f2d: ; 4f2d (1:4f2d) .load_anim ; play animation 3 times ld a, e - call Func_3b6a + call PlayDuelAnimation ld a, e - call Func_3b6a + call PlayDuelAnimation ld a, e - call Func_3b6a + call PlayDuelAnimation .loop_anim call DoFrame @@ -7054,23 +7054,23 @@ Func_6cab: ; 6cab (1:6cab) jr z, .store_duelist_turn call SwapTurn ldh a, [hWhoseTurn] - ld [wd4af], a + ld [wDuelAnimDuelistSide], a call SwapTurn jr .asm_6ccb .store_duelist_turn ldh a, [hWhoseTurn] - ld [wd4af], a + ld [wDuelAnimDuelistSide], a .asm_6ccb xor a - ld [wd4b0], a + ld [wDuelAnimLocationParam], a ld a, DUEL_ANIM_SCREEN_MAIN_SCENE ld [wDuelAnimationScreen], a pop af ; play animation - call Func_3b6a + call PlayDuelAnimation .loop_anim call DoFrame call CheckAnyAnimationPlaying @@ -7156,9 +7156,9 @@ HandlePoisonDamage: ; 6d3f (1:6d3f) .not_double_poisoned push af - ld [wd4b1], a + ld [wDuelAnimDamage], a xor a - ld [wd4b2], a + ld [wDuelAnimDamage + 1], a push hl call Func_6c7e @@ -7972,7 +7972,7 @@ _TossCoin: ; 71ad (1:71ad) .asm_7223 call Func_3b21 ld a, DUEL_ANIM_COIN_SPIN - call Func_3b6a + call PlayDuelAnimation ld a, [wCoinTossDuelistType] or a @@ -7999,7 +7999,7 @@ _TossCoin: ; 71ad (1:71ad) ; load the correct tossing animation ; and wait for it to finish ld a, d - call Func_3b6a + call PlayDuelAnimation ld a, [wCoinTossDuelistType] or a jr z, .wait_anim @@ -8029,7 +8029,7 @@ _TossCoin: ; 71ad (1:71ad) .show_result ld a, b - call Func_3b6a + call PlayDuelAnimation ; load correct sound effect ; the sound of the coin toss result @@ -8322,9 +8322,9 @@ Func_741a: ; 741a (1:741a) ld a, e ld [wLoadedMoveAnimation], a xor a - ld [wd4b0], a + ld [wDuelAnimLocationParam], a push hl - farcall Func_18f9c + farcall PlayAttackAnimationCommands pop hl jr .loop .done @@ -8406,7 +8406,7 @@ PlayMoveAnimation: ; 7494 (1:7494) ld [wLoadedMoveAnimation], a .got_anim - farcall Func_18f9c + farcall PlayAttackAnimationCommands pop bc pop de pop hl |