diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/scrolling_menu.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/scrolling_menu.asm')
| -rw-r--r-- | home/scrolling_menu.asm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index cb7d7b1c5..1662f8113 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,7 +39,6 @@ InitScrollingMenu:: ; 352f call Coord2Tile pop bc jp TextBox -; 354b JoyTextDelay_ForcehJoyDown:: ; 354b joypad call DelayFrame @@ -62,4 +59,3 @@ JoyTextDelay_ForcehJoyDown:: ; 354b joypad or c ld c, a ret -; 3567 |