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/start_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/start_menu.asm')
| -rw-r--r-- | engine/menus/start_menu.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index d8596840f..ad65f6725 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -78,13 +78,13 @@ StartMenu:: dw .ReturnRedraw .Exit: - ld a, [hOAMUpdate] + ldh a, [hOAMUpdate] push af ld a, 1 - ld [hOAMUpdate], a + ldh [hOAMUpdate], a call LoadFontsExtra pop af - ld [hOAMUpdate], a + ldh [hOAMUpdate], a .ReturnEnd: call ExitMenu .ReturnEnd2: @@ -95,7 +95,7 @@ StartMenu:: .GetInput: ; Return carry on exit, and no-carry on selection. xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call ._DrawMenuAccount call SetUpMenu ld a, $ff @@ -120,13 +120,13 @@ StartMenu:: .ExitMenuRunScript: call ExitMenu ld a, HMENURETURN_SCRIPT - ld [hMenuReturn], a + ldh [hMenuReturn], a ret .ExitMenuRunScriptCloseText: call ExitMenu ld a, HMENURETURN_SCRIPT - ld [hMenuReturn], a + ldh [hMenuReturn], a jr .ReturnEnd2 .ExitMenuCallFuncCloseText: |