diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
| commit | dac95cb42bb8bc953c7a1e1d345a549846d51abf (patch) | |
| tree | b996727e4f739da761fc1fa2418c65415ebf93d8 /engine/evolution.asm | |
| parent | Don't redundantly define sprite dimensions (diff) | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| download | pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.gz pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.tar.xz pokeyellow-dac95cb42bb8bc953c7a1e1d345a549846d51abf.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/evolution.asm')
| -rwxr-xr-x | engine/evolution.asm | 2 |
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 |