diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/intro_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 8 | ||||
| -rw-r--r-- | engine/menus/trainer_card.asm | 16 |
3 files changed, 14 insertions, 14 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: diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 67adedd1d..712032cbe 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -540,17 +540,17 @@ TrainerCard_Page2_3_OAMUpdate: jr .loop2 .facing1 - dsprite 0, 0, 0, 0, $00, 0 - dsprite 0, 0, 1, 0, $01, 0 - dsprite 1, 0, 0, 0, $02, 0 - dsprite 1, 0, 1, 0, $03, 0 + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 0, 1, 0, 0, $02, 0 + dbsprite 1, 1, 0, 0, $03, 0 db -1 .facing2 - dsprite 0, 0, 0, 0, $01, 0 | X_FLIP - dsprite 0, 0, 1, 0, $00, 0 | X_FLIP - dsprite 1, 0, 0, 0, $03, 0 | X_FLIP - dsprite 1, 0, 1, 0, $02, 0 | X_FLIP + dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP + dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP + dbsprite 0, 1, 0, 0, $03, 0 | X_FLIP + dbsprite 1, 1, 0, 0, $02, 0 | X_FLIP db -1 TrainerCard_JohtoBadgesOAM: |