diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-18 20:49:52 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-18 21:58:55 -0700 |
| commit | c169073eed4f0362ef42170098a141a2fcbd71d0 (patch) | |
| tree | a4f97ff8eff1a9fc80cadc4dba3fe9d088410656 /engine/battle/animations.asm | |
| parent | A few missed TX_ASM (diff) | |
| download | pokeyellow-c169073eed4f0362ef42170098a141a2fcbd71d0.tar.gz pokeyellow-c169073eed4f0362ef42170098a141a2fcbd71d0.tar.xz pokeyellow-c169073eed4f0362ef42170098a141a2fcbd71d0.zip | |
misc
Diffstat (limited to 'engine/battle/animations.asm')
| -rwxr-xr-x | engine/battle/animations.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6803c38b..d21e07e5 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -796,9 +796,9 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) dec a ret nz ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation - ld a,[wWhichTrade] ; number of shakes + ld a,[wNumShakes] ; number of shakes dec a ; decrement number of shakes - ld [wWhichTrade],a + ld [wNumShakes],a ret z ; if there are shakes left, restart the subanimation ld a,[W_SUBANIMSUBENTRYADDR] @@ -1998,11 +1998,11 @@ AnimationWavyScreen: ; 79666 (1e:5666) ret Func_796ae: ; 796ae (1e:56ae) - ld a, [$ff41] + ld a, [rSTAT] and $3 jr nz, Func_796ae ld a, [hl] - ld [$ff43], a + ld [rSCX], a inc hl ld a, [hl] cp d @@ -2895,7 +2895,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ; store these for later ld a,b and a,$F - ld [wWhichTrade],a + ld [wNumShakes],a ld hl,.PokeBallAnimations ; choose which toss animation to use |