diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-04 15:38:44 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-04 15:43:10 -0400 |
commit | 79184bc71846127b9a4ac20f50c4a5b646e90f20 (patch) | |
tree | 0f0d452cbe827c0439192752724bfedad7b392b9 /engine/menus | |
parent | 3cdfac7994f501cb1d8fbcdf9c64e9ce258afe30 (diff) |
Miscellaneous fixes:
- `hSecondsBackup` -> `hUnusedBackup`
- `ld bc, hBGMapAddress + 1` -> `bccoord -1, -2, 0`
- Identify some `.asm_XXX` labels
Diffstat (limited to 'engine/menus')
-rw-r--r-- | engine/menus/intro_menu.asm | 4 | ||||
-rw-r--r-- | engine/menus/scrolling_menu.asm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index c33ccfa4a..f3f74d4c5 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -110,13 +110,13 @@ _ResetWRAM: call ByteFill ldh a, [rLY] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a call DelayFrame ldh a, [hRandomSub] ld [wPlayerID], a ldh a, [rLY] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a call DelayFrame ldh a, [hRandomAdd] ld [wPlayerID + 1], a 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: |