aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/npc_movement.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-25 10:51:53 -0700
committeryenatch <yenatch@gmail.com>2014-05-25 10:53:09 -0700
commit031e33957dfaf9a5e29fb67aaf600ec809b8e35f (patch)
treeaded26de93eacbb34d4556bd1ea512a7e515c88b /engine/overworld/npc_movement.asm
parentMove bank 0 into home.asm. (diff)
downloadpokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.tar.gz
pokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.tar.xz
pokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.zip
Rename joypad registers.
Diffstat (limited to 'engine/overworld/npc_movement.asm')
-rwxr-xr-xengine/overworld/npc_movement.asm4
1 files changed, 2 insertions, 2 deletions
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)