aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/player_animations.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
commitc979b3bb03b121dd03a800df74144cd69a74601a (patch)
tree0d6bb48125efe6f6215347967383ba4c3b7da391 /engine/overworld/player_animations.asm
parentSync with pokered (diff)
parentPart 1 of syncing with pokered. (diff)
downloadpokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'engine/overworld/player_animations.asm')
-rwxr-xr-xengine/overworld/player_animations.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index a78dba35..bea43308 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -35,7 +35,7 @@ EnterMapAnim: ; 70567 (1c:4567)
ld hl, wFacingDirectionList
call PlayerSpinInPlace
ld a, $1
- ld [wd431], a
+ ld [wPikachuSpawnState], a
.restoreDefaultMusic
call PlayDefaultMusic
.done
@@ -46,7 +46,7 @@ EnterMapAnim: ; 70567 (1c:4567)
call DelayFrames
call PlayerSpinWhileMovingDown
ld a, $0
- ld [wd431], a
+ ld [wPikachuSpawnState], a
jr .done
.flyAnimation
pop hl
@@ -63,7 +63,7 @@ EnterMapAnim: ; 70567 (1c:4567)
call DoFlyAnimation
call LoadPlayerSpriteGraphics
ld a, $1
- ld [wd431], a
+ ld [wPikachuSpawnState], a
jr .restoreDefaultMusic
FlyAnimationEnterScreenCoords: ; 705ed (1c:45ed)