use joypad constants

8 files changed, 68 insertions, 48 deletions

diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm
index d985e77..11693b4 100644
--- a/src/constants/misc_constants.asm
+++ b/src/constants/misc_constants.asm
@@ -1,4 +1,26 @@
 ; console types (for wConsole)
-CONSOLE_DMG                 EQU $00
-CONSOLE_SGB                 EQU $01
-CONSOLE_CGB                 EQU $02
+CONSOLE_DMG EQU $00
+CONSOLE_SGB EQU $01
+CONSOLE_CGB EQU $02
+
+; buttons
+A_BUTTON_F EQU $0
+B_BUTTON_F EQU $1
+SELECT_F   EQU $2
+START_F    EQU $3
+D_RIGHT_F  EQU $4
+D_LEFT_F   EQU $5
+D_UP_F     EQU $6
+D_DOWN_F   EQU $7
+
+A_BUTTON   EQU 1 << A_BUTTON_F ; $01
+B_BUTTON   EQU 1 << B_BUTTON_F ; $02
+SELECT     EQU 1 << SELECT_F   ; $04
+START      EQU 1 << START_F    ; $08
+D_RIGHT    EQU 1 << D_RIGHT_F  ; $10
+D_LEFT     EQU 1 << D_LEFT_F   ; $20
+D_UP       EQU 1 << D_UP_F     ; $40
+D_DOWN     EQU 1 << D_DOWN_F   ; $80
+
+BUTTONS    EQU A_BUTTON | B_BUTTON | SELECT | START  ; $0f
+D_PAD      EQU D_RIGHT  | D_LEFT   | D_UP   | D_DOWN ; $f0
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 7ab0b22..70a8ffd 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -15,7 +15,7 @@ Func_4000: ; 4000 (1:4000)
 	ei
 	farcall Func_1a6cc
 	ldh a, [hButtonsHeld]
-	cp $3
+	cp A_BUTTON | B_BUTTON
 	jr z, .asm_4035
 	farcall Func_126d1
 	jr Func_4000
@@ -307,23 +307,23 @@ Func_42ac:
 	and a, $02
 	jr z, .asm_42cc
 	ldh a, [hButtonsPressed]
-	bit 6, a
+	bit D_UP_F, a
 	jr nz, Func_430b
-	bit 7, a
+	bit D_DOWN_F, a
 	jr nz, Func_4311
-	bit 5, a
+	bit D_LEFT_F, a
 	jr nz, Func_4320
-	bit 4, a
+	bit D_RIGHT_F, a
 	jr nz, Func_4317
-	bit 3, a
+	bit START_F, a
 	jp nz, $4364
 
 .asm_42cc
 	ldh a, [hButtonsPressed]
-	and a, $08
+	and a, START
 	jp nz, $4370
 	ldh a, [hButtonsPressed]
-	bit 2, a
+	bit SELECT_F, a
 	jp nz, $458e
 	ld a, [$cbe7]
 	or a
@@ -514,7 +514,7 @@ OpenBattleAttackMenu: ; 46fc (1:46fc)
 .asm_4736
 	call DoFrame
 	ldh a, [hButtonsPressed]
-	and $08
+	and START
 	jr nz, .displaySelectedMoveInfo
 	call MenuCursorAcceptInput
 	jr nc, .asm_4736
@@ -598,10 +598,10 @@ Func_478b: ; 478b (1:478b)
 .asm_47d4
 	call DoFrame
 	ldh a, [hButtonsPressed2]
-	and a, $30
+	and a, D_RIGHT | D_LEFT
 	jr nz, .asm_47ce
 	ldh a, [hButtonsPressed]
-	and a, $03
+	and a, A_BUTTON | B_BUTTON
 	jr z, .asm_47d4
 	ret
 
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 5de68e6..4c9900b 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -101,7 +101,7 @@ INCBIN "baserom.gbc",$8de2,$8dea - $8de2
 
 Func_8dea: ; 8dea (2:4dea)
 	ldh a, [hButtonsPressed2]
-	and $8
+	and START
 	ret z
 	ld a, [wCurMenuItem]
 	ld [$ceb1], a
@@ -421,9 +421,9 @@ Func_9065: ; 9065 (2:5065)
 	ldh a, [hButtonsPressed2]
 	or a
 	jr z, .asm_90a6
-	bit 5, a
+	bit D_LEFT_F, a
 	jr nz, .asm_907e
-	bit 4, a
+	bit D_RIGHT_F, a
 	jr z, .asm_9084
 .asm_907e
 	ld a, d
@@ -431,9 +431,9 @@ Func_9065: ; 9065 (2:5065)
 	ld d, a
 	jr .asm_9090
 .asm_9084
-	bit 6, a
+	bit D_UP_F, a
 	jr nz, .asm_908c
-	bit 7, a
+	bit D_DOWN_F, a
 	jr z, .asm_90a6
 .asm_908c
 	ld a, e
@@ -453,9 +453,9 @@ Func_9065: ; 9065 (2:5065)
 	ld [$cea3], a
 .asm_90a6
 	ldh a, [hButtonsPressed]
-	and $3
+	and A_BUTTON | B_BUTTON
 	jr z, .asm_90c1
-	and $1
+	and A_BUTTON
 	jr nz, .asm_90b7
 	ld a, $ff
 	call Func_90fb
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 9513946..f3bcee9 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -621,7 +621,7 @@ Func_c510: ; c510 (3:4510)
 	ret
 .asm_c535
 	ldh a, [hButtonsPressed]
-	and $8
+	and START
 	call nz, Func_c74d
 	ret
 ; 0xc53d
@@ -685,7 +685,7 @@ Func_c58b: ; c58b (3:458b)
 
 Func_c5ac: ; c5ac (3:45ac)
 	ldh a, [hButtonsHeld]
-	and $f0
+	and D_PAD
 	jr z, .asm_c5bf
 	call Func_c5cb
 	call Func_c5fe
@@ -694,7 +694,7 @@ Func_c5ac: ; c5ac (3:45ac)
 	jr nz, .asm_c5ca
 .asm_c5bf
 	ldh a, [hButtonsPressed]
-	and $1
+	and A_BUTTON
 	jr z, .asm_c5ca
 	call Func_c71e
 	jr .asm_c5ca
@@ -803,7 +803,7 @@ Func_c66c: ; c66c (3:466c)
 	push bc
 	ld c, $1
 	ldh a, [hButtonsHeld]
-	bit 1, a
+	bit B_BUTTON_F, a
 	jr z, .asm_c67e
 	ld a, [$d338]
 	cp $2
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 1af78f4..4796f98 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -229,7 +229,7 @@ Func_10e55: ; 10e55 (4:4e55)
 
 Func_10e71: ; 10e71 (4:4e71)
 	ldh a, [hButtonsPressed]
-	and $f0
+	and D_PAD
 	jr z, .asm_10e83
 	farcall Func_c5d5
 	ld [$d334], a
@@ -237,7 +237,7 @@ Func_10e71: ; 10e71 (4:4e71)
 	jr .asm_10e96
 .asm_10e83
 	ldh a, [hButtonsPressed]
-	and $1
+	and A_BUTTON
 	jr z, .asm_10e96
 	ld a, $2
 	call Func_3796
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index 3ddd151..ed1f96c 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -151,7 +151,7 @@ Func_1d078: ; 1d078 (7:5078)
 	jr .asm_1d095
 .asm_1d0b8
 	ldh a, [hButtonsPressed]
-	and $9
+	and A_BUTTON | START
 	jr z, .asm_1d095
 	ld a, $2
 	call Func_3796
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 3875ff7..090279a 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -678,8 +678,8 @@ ReadJoypad: ; 04de (0:04de)
 	ld b, a
 	ldh [hButtonsPressed], a
 	ldh a, [hButtonsHeld]
-	and $f
-	cp $f
+	and BUTTONS
+	cp BUTTONS
 	jr nz, asm_522       ; handle reset
 	call ResetSerial
 Reset: ; 051b (0:051b)
@@ -732,14 +732,14 @@ DoFrame: ; 053f (0:053f)
 	or a
 	jr z, .done
 	ldh a, [hButtonsPressed]
-	and $4
+	and SELECT
 	jr z, .done
 .gamePausedLoop
 	call WaitForVBlank
 	call ReadJoypad
 	call HandleDPadRepeat
 	ldh a, [hButtonsPressed]
-	and $4
+	and SELECT
 	jr z, .gamePausedLoop
 .done
 	pop bc
@@ -752,11 +752,11 @@ DoFrame: ; 053f (0:053f)
 HandleDPadRepeat: ; 0572 (0:0572)
 	ldh a, [hButtonsHeld]
 	ldh [hButtonsPressed2], a
-	and $f0
+	and D_PAD
 	jr z, .asm_58c
 	ld hl, hDPadRepeat
 	ldh a, [hButtonsPressed]
-	and $f0
+	and D_PAD
 	jr z, .asm_586
 	ld [hl], 24
 	ret
@@ -767,7 +767,7 @@ HandleDPadRepeat: ; 0572 (0:0572)
 	ret
 .asm_58c
 	ldh a, [hButtonsPressed]
-	and $f
+	and BUTTONS
 	ldh [hButtonsPressed2], a
 	ret
 
@@ -4255,7 +4255,7 @@ MenuCursorAcceptInput: ; 264b (0:264b)
 	ld a, [wNumMenuItems]
 	ld c, a
 	ld a, [wCurMenuItem]
-	bit 6, b
+	bit D_UP_F, b
 	jr z, .asm_266b
 	dec a
 	bit 7, a
@@ -4264,7 +4264,7 @@ MenuCursorAcceptInput: ; 264b (0:264b)
 	dec a
 	jr .asm_2674
 .asm_266b
-	bit 7, b
+	bit D_DOWN_F, b
 	jr z, .asm_2685
 	inc a
 	cp c
@@ -4304,9 +4304,9 @@ Func_269e: ; 269e (0:269e)
 	ret
 asm_26a9:
 	ldh a, [hButtonsPressed]
-	and $3
+	and A_BUTTON | B_BUTTON
 	jr z, HandleMenuInput
-	and $1
+	and A_BUTTON
 	jr nz, asm_269b
 	ld a, [wCurMenuItem]
 	ld e, a
@@ -4549,7 +4549,7 @@ DrawNarrowTextBox_WaitForInput: ; 2a7c (0:2a7c)
 	call DoFrame
 	call HandleTextBoxInput
 	ldh a, [hButtonsPressed]
-	and $3
+	and A_BUTTON | B_BUTTON
 	jr z, .waitAorBLoop
 	ret
 
@@ -4576,7 +4576,7 @@ WaitForWideTextBoxInput: ; 2aae (0:2aae)
 	call DoFrame
 	call HandleTextBoxInput
 	ldh a, [hButtonsPressed]
-	and $3
+	and A_BUTTON | B_BUTTON
 	jr z, .waitAorBLoop
 	call EraseCursor
 	ret
@@ -4609,10 +4609,10 @@ Func_2af0: ; 2af0 (0:2af0)
 	call DoFrame
 	call HandleTextBoxInput
 	ldh a, [hButtonsPressed]
-	bit 0, a
+	bit A_BUTTON_F, a
 	jr nz, .asm_2b50
 	ldh a, [hButtonsPressed2]
-	and $30
+	and D_RIGHT | D_LEFT
 	jr z, .asm_2b1f
 	ld a, $1
 	call Func_3796
@@ -5110,7 +5110,7 @@ PrintText: ; 2e41 (0:2e41)
 	cp $3
 	jr nc, .applyDelay
 	; if text speed is 1, pressing b ignores it
-	bit 1, b
+	bit B_BUTTON_F, b
 	jr nz, .skipDelay
 	jr .applyDelay
 .textDelayLoop
diff --git a/src/wram.asm b/src/wram.asm
index 9b1d932..30826db 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -8,7 +8,7 @@ INCLUDE "macros.asm"
 SECTION "WRAM0", WRAM0
 	ds $200
 
-;--- Duels 1 ----------------------------------------------
+;--- Duel variables ----------------------------------------------
 
 wPlayerDuelVariables:: ; c200
 
@@ -340,7 +340,7 @@ wSerialRecvBuf:: ; $cba5 - $cbc4
 	ds $20
 	ds $1
 
-;--- Duels 2 ----------------------------------------------
+;--- Engine ----------------------------------------------
 
 ; In a duel, the main menu current or last selected menu item
 ; From 0 to 5: Hand, Attack, Check, Pkmn Power, Retreat, Done
@@ -487,8 +487,6 @@ wccf0:: ; ccf0
 wccf1:: ; ccf1
 	ds $2
 
-;--- Overworld --------------------------------------------
-
 ; color/pattern of the text box border. Values between 0-7?. Interpreted differently depending on console type
 ; Note that this doesn't appear to be a selectable option, just changes with the situation.
 ; For example the value 4 seems to be used a lot during duels.