diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/main_menu.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/main_menu.asm')
| -rwxr-xr-x | engine/main_menu.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm index f82c6072a..9d3d8cbdb 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -20,7 +20,7 @@ MainMenu: ; 49cdc call CloseWindow jr c, .quit call ClearTileMap - ld a, [MenuSelection] + ld a, [wMenuSelection] ld hl, .Jumptable rst JumpTable jr MainMenu @@ -225,13 +225,13 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 xor a ld [hBGMapMode], a call .PlaceBox - ld hl, Options + ld hl, wOptions ld a, [hl] push af set NO_TEXT_SCROLL, [hl] call .PlaceTime pop af - ld [Options], a + ld [wOptions], a ld a, $1 ld [hBGMapMode], a ret |