diff options
| -rw-r--r-- | engine/menus/intro_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 8 | ||||
| -rw-r--r-- | engine/pokegear/pokegear.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 2 | ||||
| -rw-r--r-- | hram.asm | 2 |
5 files changed, 9 insertions, 9 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/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index fd82bb1c3..d2d2d61f9 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1128,7 +1128,7 @@ PokegearPhoneContactSubmenu: ld h, a inc de push hl - ld bc, hBGMapAddress + 1 + bccoord -1, -2, 0 add hl, bc ld a, [de] inc de diff --git a/home/vblank.asm b/home/vblank.asm index 4fea80c50..afa4dcbe5 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -140,7 +140,7 @@ VBlank0:: rst Bankswitch ldh a, [hSeconds] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a ret @@ -146,7 +146,7 @@ hRandom:: hRandomAdd:: db ; ffe1 hRandomSub:: db ; ffe2 -hSecondsBackup:: db ; ffe3 +hUnusedBackup:: db ; ffe3 hBattleTurn:: ; ffe4 ; Which trainer's turn is it? 0: player, 1: opponent trainer |