diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:39 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:34:38 -0400 |
| commit | ea426a88794b1d216a278b54d18cefafbf7d8771 (patch) | |
| tree | 732c7a81c528251b651b6441d0f4a974548beb2c /home/joypad.asm | |
| parent | 6d333bed5fde0c2da0a6a9df2ccae83933400e42 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'home/joypad.asm')
| -rw-r--r-- | home/joypad.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 05868d8b3..8dbe2cc5c 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -27,8 +27,8 @@ UpdateJoypad:: ; hJoypadSum: pressed so far ; Any of these three bits can be used to disable input. - ld a, [wcfbe] - and %11010000 + ld a, [wJoypadDisable] + and (1 << JOYPAD_DISABLE_MON_FAINT_F) | (1 << JOYPAD_DISABLE_SGB_TRANSFER_F) | (1 << 4) ret nz ; If we're saving, input is disabled. |