summaryrefslogtreecommitdiff
path: root/scripts/lorelei.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 /scripts/lorelei.asm
parent1ee8de792ba5bf45290a4cb49b6bc3ee6aa539f3 (diff)
Rename joypad registers.
Diffstat (limited to 'scripts/lorelei.asm')
-rwxr-xr-xscripts/lorelei.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index eb2da2bd..b102d271 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -63,8 +63,8 @@ LoreleiScript0: ; 761e2 (1d:61e2)
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
xor a
- ld [H_NEWLYPRESSEDBUTTONS], a
- ld [H_CURRENTPRESSEDBUTTONS], a
+ ld [hJoyPressed], a
+ ld [hJoyHeld], a
ld [$ccd3], a
ld [$cd38], a
ld a, [wWhichTrade] ; $cd3d
@@ -101,7 +101,7 @@ LoreleiScript3: ; 7622c (1d:622c)
ret nz
call Delay3
xor a
- ld [wJoypadForbiddenButtonsMask], a
+ ld [wJoyIgnore], a
ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a
ret