diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/scrolling_menu.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/scrolling_menu.asm')
| -rw-r--r-- | home/scrolling_menu.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index cb7d7b1c5..cf8e02fa8 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -1,4 +1,4 @@ -ScrollingMenu:: ; 350c +ScrollingMenu:: call CopyMenuData ld a, [hROMBank] push af @@ -15,16 +15,14 @@ ScrollingMenu:: ; 350c ld a, [wMenuJoypad] ret -; 3524 -.UpdatePalettes: ; 3524 +.UpdatePalettes: ld hl, wVramState bit 0, [hl] jp nz, UpdateTimePals jp SetPalettes -; 352f -InitScrollingMenu:: ; 352f +InitScrollingMenu:: ld a, [wMenuBorderTopCoord] dec a ld b, a @@ -41,9 +39,8 @@ InitScrollingMenu:: ; 352f call Coord2Tile pop bc jp TextBox -; 354b -JoyTextDelay_ForcehJoyDown:: ; 354b joypad +JoyTextDelay_ForcehJoyDown:: call DelayFrame ld a, [hInMenu] @@ -62,4 +59,3 @@ JoyTextDelay_ForcehJoyDown:: ; 354b joypad or c ld c, a ret -; 3567 |