diff options
| author | yenatch <yenatch@gmail.com> | 2014-05-25 10:51:53 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-05-25 10:53:09 -0700 |
| commit | 031e33957dfaf9a5e29fb67aaf600ec809b8e35f (patch) | |
| tree | aded26de93eacbb34d4556bd1ea512a7e515c88b /scripts/lance.asm | |
| parent | Move bank 0 into home.asm. (diff) | |
| download | pokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.tar.gz pokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.tar.xz pokeyellow-031e33957dfaf9a5e29fb67aaf600ec809b8e35f.zip | |
Rename joypad registers.
Diffstat (limited to 'scripts/lance.asm')
| -rwxr-xr-x | scripts/lance.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lance.asm b/scripts/lance.asm index 445b4052..e2019442 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, [wWhichTrade] ; $cd3d cp $3 jr nc, .asm_5a325 @@ -99,7 +99,7 @@ LanceScript2: ; 5a349 (16:6349) LanceScript_5a35b: ; 5a35b (16:635b) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld hl, $ccd3 ld de, RLEList_5a379 call DecodeRLEList @@ -124,7 +124,7 @@ LanceScript3: ; 5a382 (16:6382) ret nz call Delay3 xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_LANCECURSCRIPT], a ld [W_CURMAPSCRIPT], a ret |