diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 02:34:42 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 02:34:42 -0500 |
| commit | 42f99e9aff80a4c8d47c17f6dda2494e1bd6f7d9 (patch) | |
| tree | b2cb959094a6574f20b72fce2d03207b0f56c0c3 /engine/battle | |
| parent | 9a5b7f5d19e84eb1caab7ecddaa0f157ebae5594 (diff) | |
| parent | a51037eeeedb03e29d8675626018cf02750882fa (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into merge-pokered
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 1 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 0d93b295..8df31e1c 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -282,7 +282,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: @@ -3202,7 +3202,7 @@ TossBallAnimation: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM, HIDEPIC_ANIM, SHAKE_ANIM, POOF_ANIM, SHOWPIC_ANIM -.BlockBall ; 79ff6 (1e:5ff6) +.BlockBall ld a, TOSS_ANIM ld [wAnimationID], a call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fa56e5b2..6805fbfe 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4834,7 +4834,6 @@ UnusedHighCriticalMoves: db CRABHAMMER db SLASH db $FF -; 3e023 ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are, not coincidentally, diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 3624f5ea..2f2c46a6 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -740,8 +740,7 @@ AICureStatus: res 0,[hl] ret -AIUseXAccuracy: -; unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] @@ -755,8 +754,7 @@ AIUseGuardSpec: ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: -; unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] |