diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 10:51:30 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 10:51:30 -0500 |
| commit | 3453879756d32b6fcbf1517cc1de51f2c157c75d (patch) | |
| tree | fc2524b3950c3fec68c527dcaf26d1130ee2ee53 /engine/joypad.asm | |
| parent | 464cfc9d97be09397775ce1f54d7c5b0b9fb28ae (diff) | |
| parent | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (diff) | |
Merge branch 'master' into remove-extras
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 |