Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use labels instead of constants for HRAM

Browse Source 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
Rangi
2018-08-25 14:28:22 -04:00
parent 376c64468b
commit eb1e3636bb
243 changed files with 4706 additions and 4661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
engine/menus/options_menu.asm
View File

@@ -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