Rename joypad registers.

13 files changed, 25 insertions, 25 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a0e8f3ee..48d075c0 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -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
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 608ef76e..504da7be 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -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
 
diff --git a/engine/intro.asm b/engine/intro.asm
index 2a3d72a1..e1063d6c 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -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
diff --git a/engine/items/items.asm b/engine/items/items.asm
index a12dd463..d496dc87 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -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
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 5e4e3436..c7877cd9 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -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
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 7e34feca..2ab7d35e 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -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
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 36aba5eb..b62d8a94 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -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
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 774f604d..be0e851d 100755
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -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
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index d2f248cd..12a78507 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -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
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 54d7321b..92200353 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -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)
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 1af178c7..8e50259c 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -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)
diff --git a/engine/play_time.asm b/engine/play_time.asm
index 6eb8bc17..4178e5bf 100755
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -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
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index f11281c7..9648bd52 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -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