summaryrefslogtreecommitdiff
path: root/engine/menu/main_menu.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-25 10:51:53 -0700
committeryenatch <yenatch@gmail.com>2014-05-25 10:53:09 -0700
commit031e33957dfaf9a5e29fb67aaf600ec809b8e35f (patch)
treeaded26de93eacbb34d4556bd1ea512a7e515c88b /engine/menu/main_menu.asm
parent1ee8de792ba5bf45290a4cb49b6bc3ee6aa539f3 (diff)
Rename joypad registers.
Diffstat (limited to 'engine/menu/main_menu.asm')
-rwxr-xr-xengine/menu/main_menu.asm12
1 files changed, 6 insertions, 6 deletions
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