Miscellaneous fixes:

- `hSecondsBackup` -> `hUnusedBackup`
- `ld bc, hBGMapAddress + 1` -> `bccoord -1, -2, 0`
- Identify some `.asm_XXX` labels
This commit is contained in:
Rangi 2020-04-04 15:38:44 -04:00
parent 3cdfac7994
commit 79184bc718
5 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -140,7 +140,7 @@ VBlank0::
rst Bankswitch
ldh a, [hSeconds]
ldh [hSecondsBackup], a
ldh [hUnusedBackup], a
ret

View File

@ -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