diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-04-06 12:41:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-06 12:41:44 -0400 |
commit | 9076d63d62c847dd74b02391a4744ba83c7770e8 (patch) | |
tree | 69cd3cd33c9457b40ac4503d69f3cf3c0604772e /engine/menus/scrolling_menu.asm | |
parent | e225d296b72a41cbee6e16416d8d1fcfb4760445 (diff) | |
parent | 3144b54bd1dcc47ea339fcd2bd215ec96fc38c4a (diff) |
Merge pull request #705 from Rangi42/master
Upgrade to rgbds 0.4.0, and do miscellaneous fixes
Diffstat (limited to 'engine/menus/scrolling_menu.asm')
-rw-r--r-- | engine/menus/scrolling_menu.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index b26442dc7..6b0572a6d 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -244,16 +244,16 @@ InitScrollingMenuCursor: ld a, [wScrollingMenuListSize] inc a cp b - jr c, .asm_2475a - jr nc, .asm_24763 + jr c, .wrap + jr nc, .done -.asm_2475a +.wrap xor a ld [wMenuScrollPosition], a ld a, $1 ld [wMenuCursorBuffer], a -.asm_24763 +.done ret ScrollingMenu_InitFlags: |