diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/battle/animations.asm | |
| parent | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (diff) | |
| parent | 2685abc3c58d4d542687f80ea83da75de46cf36a (diff) | |
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/battle/animations.asm')
| -rwxr-xr-x | engine/battle/animations.asm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 31148392..bfbaa180 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1034,6 +1034,7 @@ TailWhipAnimationUnused: ld c, 20 jp DelayFrames +; Format: Special Effect ID (1 byte), Address (2 bytes) SpecialEffectPointers: db SE_DARK_SCREEN_FLASH ; $FE dw AnimationFlashScreen @@ -2040,7 +2041,7 @@ _AnimationSlideMonOff: ; functions below catch it by checking if the tile number is within the valid ; range and if not, replacing it with a blank tile. -.PlayerNextTile ; 79702 (1e:5702) +.PlayerNextTile ld a, [hl] add 7 ; bugfix: compares against the max tile + 1 as opposed to the max tile @@ -2049,7 +2050,7 @@ _AnimationSlideMonOff: ld a, " " ret -.EnemyNextTile ; 7970b (1e:570b) +.EnemyNextTile ld a, [hl] sub 7 ; This has the same problem as above, but it has no visible effect because @@ -3202,7 +3203,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 |