diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/menus/options_menu.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/menus/options_menu.asm')
| -rw-r--r-- | engine/menus/options_menu.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index 4dc6c0fe1..d13868279 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -18,7 +18,7 @@ _OptionsMenu: .print_text_loop ; this next will display the settings of each option when the menu is opened push bc xor a - ld [hJoyLast], a + ldh [hJoyLast], a call GetOptionPointer pop bc ld hl, wJumptableIndex @@ -30,7 +30,7 @@ _OptionsMenu: xor a ld [wJumptableIndex], a inc a - ld [hBGMapMode], a + ldh [hBGMapMode], a call WaitBGMap ld b, SCGB_DIPLOMA call GetSGBLayout @@ -38,7 +38,7 @@ _OptionsMenu: .joypad_loop call JoyTextDelay - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and START | B_BUTTON jr nz, .ExitOptions call OptionsControl @@ -57,7 +57,7 @@ _OptionsMenu: call PlaySFX call WaitSFX pop af - ld [hInMenu], a + ldh [hInMenu], a ret StringOptions: @@ -106,7 +106,7 @@ GetOptionPointer: Options_TextSpeed: call GetTextSpeed - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -187,7 +187,7 @@ GetTextSpeed: Options_BattleScene: ld hl, wOptions - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -226,7 +226,7 @@ Options_BattleScene: Options_BattleStyle: ld hl, wOptions - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -264,7 +264,7 @@ Options_BattleStyle: Options_Sound: ld hl, wOptions - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -316,7 +316,7 @@ Options_Sound: Options_Print: call GetPrinterSetting - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -411,7 +411,7 @@ GetPrinterSetting: Options_MenuAccount: ld hl, wOptions2 - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -449,7 +449,7 @@ Options_MenuAccount: Options_Frame: ld hl, wTextBoxFrame - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .LeftPressed bit D_RIGHT_F, a @@ -479,7 +479,7 @@ UpdateFrame: ret Options_Cancel: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and A_BUTTON jr nz, .Exit and a @@ -491,7 +491,7 @@ Options_Cancel: OptionsControl: ld hl, wJumptableIndex - ld a, [hJoyLast] + ldh a, [hJoyLast] cp D_DOWN jr z, .DownPressed cp D_UP |