Some work on battle animations

This commit is contained in:
PikalaxALT
2015-11-09 16:41:09 -05:00
parent 59d67a44be
commit 93ab6985d2
29 changed files with 787 additions and 675 deletions

View File

@@ -20,7 +20,7 @@ BattleCommand_Attract: ; 377ce
jp StdBattleTextBox
.failed
jp Function37354
jp FailAttract
; 377f5

View File

@@ -19,5 +19,5 @@ BattleCommand_Foresight: ; 376a0
jp StdBattleTextBox
.failed
jp Function37354
jp FailForesight
; 376c2

View File

@@ -1,8 +1,8 @@
BattleCommand_Metronome: ; 37418
; metronome
call Function372d8
call Function34548
call ClearLastMove
call CheckUserIsCharging
jr nz, .asm_3742b
ld a, [wKickCounter]
@@ -12,7 +12,7 @@ BattleCommand_Metronome: ; 37418
ld [wKickCounter], a
.asm_3742b
call PlayPlayerMoveAnim_ClearHiID
call LoadMoveAnim
.GetMove
call BattleRandom

View File

@@ -1,7 +1,7 @@
BattleCommand_MirrorMove: ; 373c9
; mirrormove
call Function372d8
call ClearLastMove
ld a, BATTLE_VARS_MOVE
call GetBattleVarAddr
@@ -37,7 +37,7 @@ BattleCommand_MirrorMove: ; 373c9
call GetMoveData
call GetMoveName
call CopyName1
call Function34548
call CheckUserIsCharging
jr nz, .done
ld a, [wKickCounter]

View File

@@ -23,7 +23,7 @@ ProtectChance: ; 3762c
ld de, EnemyProtectCount
.asm_37637
call Function36abf
call CheckOpponentWentFirst
jr nz, .failed
; Can't have a substitute.

View File

@@ -23,5 +23,5 @@ BattleCommand_Spikes: ; 37683
jp StdBattleTextBox
.failed
jp Function37354
jp FailSpikes
; 376a0