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/vermilioncity.asm | |
| parent | 1ee8de792ba5bf45290a4cb49b6bc3ee6aa539f3 (diff) | |
Rename joypad registers.
Diffstat (limited to 'scripts/vermilioncity.asm')
| -rwxr-xr-x | scripts/vermilioncity.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 3298221f..62fd9fce 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -46,7 +46,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) call ArePlayerCoordsInArray ret nc xor a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [hJoyHeld], a ld [$cf0d], a ld a, $3 ld [$ff8c], a @@ -84,7 +84,7 @@ VermilionCityScript4: ; 19826 (6:5826) VermilionCityScript2: ; 19833 (6:5833) ld a, $ff - ld [wJoypadForbiddenButtonsMask], a + ld [wJoyIgnore], a ld a, $40 ld [$ccd3], a ld [$ccd4], a @@ -100,8 +100,8 @@ VermilionCityScript3: ; 1984e (6:584e) and a ret nz xor a - ld [wJoypadForbiddenButtonsMask], a - ld [H_CURRENTPRESSEDBUTTONS], a + ld [wJoyIgnore], a + ld [hJoyHeld], a ld a, $0 ld [W_VERMILIONCITYCURSCRIPT], a ret |