diff options
| author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
| commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
| tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /engine/joypad.asm | |
| parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
| parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) | |
Merge branch 'sprites'
Diffstat (limited to 'engine/joypad.asm')
| -rw-r--r-- | engine/joypad.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/joypad.asm b/engine/joypad.asm index b9702d33a..5266ef8a8 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -103,7 +103,7 @@ Joypad: ; 935 ; For example, soft reset: and BUTTON_A | BUTTON_B | SELECT | START cp BUTTON_A | BUTTON_B | SELECT | START - jp z, $0150 ; reset + jp z, Reset ret ; 984 |