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/menu/main_menu.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/menu/main_menu.asm')
| -rwxr-xr-x | engine/menu/main_menu.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 4044da43..5f8f0c1d 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -307,7 +307,7 @@ Func_5d5f: ; 5d5f (1:5d5f) xor a ld [hJoyPressed], a ld [hJoyHeld], a - ld [$ffb5], a + ld [hJoy5], a ld [wd72d], a ld hl, wd732 set 0, [hl] @@ -461,7 +461,7 @@ DisplayOptionMenu: ; 5e8a (1:5e8a) call SetOptionsFromCursorPositions .getJoypadStateLoop call JoypadLowSensitivity - ld a,[$ffb5] + ld a,[hJoy5] ld b,a and a,%11111011 ; any key besides select pressed? jr z,.getJoypadStateLoop |