aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menus/options.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
committerdannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
commita02a98ee7ada1a658e28698484058be2796dc0df (patch)
tree945986054565bd8b5212fc755415096050d1d3a8 /engine/menus/options.asm
parentUse long option flags for rgbgfx, same as tools/gfx (diff)
parentUse `const_skip` (diff)
downloadpokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus/options.asm')
-rw-r--r--engine/menus/options.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/menus/options.asm b/engine/menus/options.asm
index e2c02e42..a2a96dd6 100644
--- a/engine/menus/options.asm
+++ b/engine/menus/options.asm
@@ -43,9 +43,9 @@ OptionMenuJumpTable:
OptionsMenu_TextSpeed:
call GetTextSpeed
ldh a, [hJoy5]
- bit 4, a ; right
+ bit BIT_D_RIGHT, a
jr nz, .pressedRight
- bit 5, a
+ bit BIT_D_LEFT, a
jr nz, .pressedLeft
jr .nonePressed
.pressedRight
@@ -193,9 +193,9 @@ OptionsMenu_SpeakerSettings:
swap a
ld c, a
ldh a, [hJoy5]
- bit 4, a
+ bit BIT_D_RIGHT, a
jr nz, .pressedRight
- bit 5, a
+ bit BIT_D_LEFT, a
jr nz, .pressedLeft
jr .asm_41dca
.pressedRight
@@ -248,9 +248,9 @@ Earphone3SoundText:
OptionsMenu_GBPrinterBrightness:
call Func_41e7b
ldh a, [hJoy5]
- bit 4, a
+ bit BIT_D_RIGHT, a
jr nz, .pressedRight
- bit 5, a
+ bit BIT_D_LEFT, a
jr nz, .pressedLeft
jr .asm_41e32
.pressedRight