diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 20:46:23 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 20:46:23 -0500 |
| commit | d7a5ea998d5c92607b32e633d8875898a6bc450b (patch) | |
| tree | cba5438a7d0e15762e032816f67774dd4b2ec9d8 /battle/core.asm | |
| parent | 8152ab612c0405d9e0074b7d51c9785e0dd3bc95 (diff) | |
More battle anims and bg effects
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/battle/core.asm b/battle/core.asm index 436b96224..09ebefee9 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3762,7 +3762,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 xor a ld [wNumHits], a - ld [wKickCounter], a + ld [wBattleAnimParam], a call SetEnemyTurn ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim @@ -3770,7 +3770,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 call BattleCheckEnemyShininess jr nc, .not_shiny ld a, 1 ; shiny anim - ld [wKickCounter], a + ld [wBattleAnimParam], a ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim .not_shiny @@ -4268,13 +4268,13 @@ SendOutPlayerMon: ; 3db5f call SetPlayerTurn xor a ld [wNumHits], a - ld [wKickCounter], a + ld [wBattleAnimParam], a ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim call BattleCheckPlayerShininess jr nc, .not_shiny - ld a, $1 - ld [wKickCounter], a + ld a, 1 + ld [wBattleAnimParam], a ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim @@ -8398,7 +8398,7 @@ GetMonBackpic: ; 3f43d ld hl, BattleAnimCmd_RaiseSub jr nz, GetBackpic_DoAnim ; substitute -Function3f447: ; 3f447 +DropPlayerSub: ; 3f447 ld a, [wPlayerMinimized] and a ld hl, BattleAnimCmd_MinimizeOpp @@ -8434,7 +8434,7 @@ GetMonFrontpic: ; 3f47c ld hl, BattleAnimCmd_RaiseSub jr nz, GetFrontpic_DoAnim -Function3f486: ; 3f486 +DropEnemySub: ; 3f486 ld a, [wEnemyMinimized] and a ld hl, BattleAnimCmd_MinimizeOpp @@ -9595,7 +9595,7 @@ BattleStartMessage: ; 3fc8b ld a, 1 ld [hBattleTurn], a ld a, 1 - ld [wKickCounter], a + ld [wBattleAnimParam], a ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim |