diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /engine/overworld/check_player_state.asm | |
parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'engine/overworld/check_player_state.asm')
-rw-r--r-- | engine/overworld/check_player_state.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm index a89b3d48..5dd91c4c 100644 --- a/engine/overworld/check_player_state.asm +++ b/engine/overworld/check_player_state.asm @@ -90,7 +90,7 @@ IsPlayerFacingEdgeOfMap: ; c148 (3:4148) push hl push de push bc - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + ld a, [wPlayerFacingDirection] ; player sprite's facing direction srl a ld c, a ld b, $0 @@ -160,7 +160,7 @@ IsWarpTileInFrontOfPlayer: ; c197 (3:4197) ld a, [wCurMap] cp SS_ANNE_5 jr z, .ssAnne5 - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + ld a, [wPlayerFacingDirection] ; player sprite's facing direction srl a ld c, a ld b, 0 |