diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-26 11:50:30 -0500 |
| commit | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (patch) | |
| tree | eba145aa3ec6cc1216604b953dfe2bdce6e94dd2 /engine/joypad.asm | |
| parent | 5098ed740d35d4f2a2d5414f309bf25e754e189c (diff) | |
| parent | 76fe7c5aa1b93a6d03280ad54f411e351dd0abc2 (diff) | |
Merge remote-tracking branch 'yenatch/merge-kanzure-again' into master
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 |