summaryrefslogtreecommitdiff
path: root/engine/evolution.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-09-19 23:19:05 -0400
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-09-19 23:19:05 -0400
commitdac95cb42bb8bc953c7a1e1d345a549846d51abf (patch)
treeb996727e4f739da761fc1fa2418c65415ebf93d8 /engine/evolution.asm
parent57113a7651ba8a7f88e119ca3de7acb45a77db69 (diff)
parent1185d69819af3493fe8ace9f576fee4b420db55e (diff)
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/evolution.asm')
-rwxr-xr-xengine/evolution.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/evolution.asm b/engine/evolution.asm
index 07ccdbda..a52e0071 100755
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -140,7 +140,7 @@ asm_7befa: ; 7befa (1e:7efa)
call DelayFrame
push bc
call JoypadLowSensitivity
- ld a, [$ffb5]
+ ld a, [hJoy5]
pop bc
and $2
jr nz, .asm_7bf0d