diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/ledges.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index d2f248cd..12a78507 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -38,11 +38,11 @@ HandleLedges: ; 1a672 (6:6672) inc hl jr .asm_1a691 .asm_1a6a9 - ld a, [H_CURRENTPRESSEDBUTTONS] + ld a, [hJoyHeld] and e ret z ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d736 set 6, [hl] call Func_3486 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 54d7321b..92200353 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -4,7 +4,7 @@ Func_1a3e0: ; 1a3e0 (6:63e0) call HandleDoors jr nc, .asm_1a406 ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $d736 set 1, [hl] ld a, $1 @@ -76,7 +76,7 @@ Func_1a44c: ; 1a44c (6:644c) ld hl, W_FLAGS_D733 set 1, [hl] ld a, $fc - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret Func_1a485: ; 1a485 (6:6485) diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 1af178c7..8e50259c 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -503,16 +503,16 @@ _HandleMidJump: ; 7087e (1c:487e) call UpdateSprites call Delay3 xor a - ld [H_CURRENTPRESSEDBUTTONS], a - ld [H_NEWLYPRESSEDBUTTONS], a - ld [H_NEWLYRELEASEDBUTTONS], a + ld [hJoyHeld], a + ld [hJoyPressed], a + ld [hJoyReleased], a ld [$d714], a ld hl, $d736 res 6, [hl] ld hl, $d730 res 7, [hl] xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ret PlayerJumpingYScreenCoords: ; 708ba (1c:48ba) |