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/pokemontower6.asm | |
| parent | 1ee8de792ba5bf45290a4cb49b6bc3ee6aa539f3 (diff) | |
Rename joypad registers.
Diffstat (limited to 'scripts/pokemontower6.asm')
| -rwxr-xr-x | scripts/pokemontower6.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index e3d8a4c4..2b61857f 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -9,7 +9,7 @@ PokemonTower6Script: ; 60aef (18:4aef) Func_60b02: ; 60b02 (18:4b02) xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -29,7 +29,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17) call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID @@ -50,13 +50,13 @@ PokemonTower6Script4: ; 60b48 (18:4b48) cp $ff jp z, Func_60b02 ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$d72d] bit 6, a ret nz call UpdateSprites ld a, $f0 - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, [$cf0b] and a jr nz, .asm_60b82 @@ -66,7 +66,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld [H_DOWNARROWBLINKCNT2], a ; $ff8c call DisplayTextID xor a - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $0 ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a |