Rename joypad registers.

This commit is contained in:
yenatch 2014-05-25 10:51:53 -07:00
parent 1ee8de792b
commit 031e33957d
73 changed files with 306 additions and 301 deletions

View file

@ -6677,7 +6677,7 @@ asm_3ef23: ; 3ef23 (f:6f23)
ld a, [$d732]
bit 1, a
jr z, .asm_3ef2f
ld a, [H_CURRENTPRESSEDBUTTONS]
ld a, [hJoyHeld]
bit 1, a
ret nz
.asm_3ef2f

View file

@ -94,7 +94,7 @@ asm_1e9b0: ; 1e9b0 (7:69b0)
PrintSafariGameOverText: ; 1e9ed (7:69ed)
xor a
ld [wJoypadForbiddenButtonsMask], a
ld [wJoyIgnore], a
ld hl, SafariGameOverText
jp PrintText

View file

@ -1,6 +1,6 @@
PlayIntro: ; 41682 (10:5682)
xor a
ld [H_CURRENTPRESSEDBUTTONS], a
ld [hJoyHeld], a
inc a
ld [H_AUTOBGTRANSFERENABLED], a
call PlayShootingStar

View file

@ -530,7 +530,7 @@ ItemUseBicycle: ; d977 (3:5977)
jp nc,NoCyclingAllowedHere
call ItemUseReloadOverworldData
xor a ; no keys pressed
ld [H_CURRENTPRESSEDBUTTONS],a ; current joypad state
ld [hJoyHeld],a ; current joypad state
inc a
ld [$d700],a ; change player state to bicycling
ld hl,GotOnBicycleText
@ -593,7 +593,7 @@ ItemUseSurfboard: ; d9b4 (3:59b4)
xor a
ld [$d700],a ; change player state to walking
dec a
ld [wJoypadForbiddenButtonsMask],a
ld [wJoyIgnore],a
call Func_2307 ; play walking music
jp LoadWalkingPlayerSpriteGraphics
; uses a simulated button press to make the player move forward

View file

@ -54,7 +54,7 @@ Func_765e5: ; 765e5 (1d:65e5)
push bc
call Func_76610
call WaitForTextScrollButtonPress
ld a, [H_CURRENTPRESSEDBUTTONS]
ld a, [hJoyHeld]
bit 1, a
jr nz, .fifth
ld hl, $CC6B

View file

@ -97,11 +97,11 @@ MainMenu: ; 5af2 (1:5af2)
set 5,[hl]
.next6
xor a
ld [H_NEWLYPRESSEDBUTTONS],a
ld [H_NEWLYRELEASEDBUTTONS],a
ld [H_CURRENTPRESSEDBUTTONS],a
ld [hJoyPressed],a
ld [hJoyReleased],a
ld [hJoyHeld],a
call GetJoypadState
ld a,[H_CURRENTPRESSEDBUTTONS]
ld a,[hJoyHeld]
bit 0,a
jr nz,.next5
bit 1,a
@ -315,8 +315,8 @@ Func_5d52: ; 5d52 (1:5d52)
Func_5d5f: ; 5d5f (1:5d5f)
xor a
ld [H_NEWLYPRESSEDBUTTONS], a
ld [H_CURRENTPRESSEDBUTTONS], a
ld [hJoyPressed], a
ld [hJoyHeld], a
ld [$ffb5], a
ld [$d72d], a
ld hl, $d732

View file

@ -134,7 +134,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
pop af
ld [wCurrentMenuItem], a ; $cc26
call GetJoypadStateLowSensitivity
ld a, [H_NEWLYPRESSEDBUTTONS]
ld a, [hJoyPressed]
and a
jr z, .asm_65ff
ld hl, .unknownPointerTable_665e ; $665e

View file

@ -81,7 +81,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf)
; EXIT falls through to here
CloseStartMenu:: ; 2b70 (0:2b70)
call GetJoypadState
ld a,[H_NEWLYPRESSEDBUTTONS]
ld a,[hJoyPressed]
bit 0,a ; was A button newly pressed?
jr nz,CloseStartMenu
call LoadTextBoxTilePatterns

View file

@ -38,11 +38,11 @@ HandleLedges: ; 1a672 (6:6672)
inc hl
jr .asm_1a691
.asm_1a6a9
ld a, [H_CURRENTPRESSEDBUTTONS]
ld a, [hJoyHeld]
and e
ret z
ld a, $ff
ld [wJoypadForbiddenButtonsMask], a
ld [wJoyIgnore], a
ld hl, $d736
set 6, [hl]
call Func_3486

View file

@ -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)

View file

@ -503,16 +503,16 @@ _HandleMidJump: ; 7087e (1c:487e)
call UpdateSprites
call Delay3
xor a
ld [H_CURRENTPRESSEDBUTTONS], a
ld [H_NEWLYPRESSEDBUTTONS], a
ld [H_NEWLYRELEASEDBUTTONS], a
ld [hJoyHeld], a
ld [hJoyPressed], a
ld [hJoyReleased], a
ld [$d714], a
ld hl, $d736
res 6, [hl]
ld hl, $d730
res 7, [hl]
xor a
ld [wJoypadForbiddenButtonsMask], a
ld [wJoyIgnore], a
ret
PlayerJumpingYScreenCoords: ; 708ba (1c:48ba)

View file

@ -56,6 +56,6 @@ Func_18e36: ; 18e36 (6:4e36)
ld [$d730], a
ret z
xor a
ld [H_NEWLYPRESSEDBUTTONS], a
ld [H_CURRENTPRESSEDBUTTONS], a
ld [hJoyPressed], a
ld [hJoyHeld], a
ret

View file

@ -238,7 +238,7 @@ ENDC
call Func_4533
call Delay3
call LoadGBPal
ld a, [H_CURRENTPRESSEDBUTTONS]
ld a, [hJoyHeld]
ld b, a
and $46
cp $46