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 call ByteFill
ldh a, [rLY] ldh a, [rLY]
ldh [hSecondsBackup], a ldh [hUnusedBackup], a
call DelayFrame call DelayFrame
ldh a, [hRandomSub] ldh a, [hRandomSub]
ld [wPlayerID], a ld [wPlayerID], a
ldh a, [rLY] ldh a, [rLY]
ldh [hSecondsBackup], a ldh [hUnusedBackup], a
call DelayFrame call DelayFrame
ldh a, [hRandomAdd] ldh a, [hRandomAdd]
ld [wPlayerID + 1], a ld [wPlayerID + 1], a

View File

@ -244,16 +244,16 @@ InitScrollingMenuCursor:
ld a, [wScrollingMenuListSize] ld a, [wScrollingMenuListSize]
inc a inc a
cp b cp b
jr c, .asm_2475a jr c, .wrap
jr nc, .asm_24763 jr nc, .done
.asm_2475a .wrap
xor a xor a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
ld a, $1 ld a, $1
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
.asm_24763 .done
ret ret
ScrollingMenu_InitFlags: ScrollingMenu_InitFlags:

View File

@ -1128,7 +1128,7 @@ PokegearPhoneContactSubmenu:
ld h, a ld h, a
inc de inc de
push hl push hl
ld bc, hBGMapAddress + 1 bccoord -1, -2, 0
add hl, bc add hl, bc
ld a, [de] ld a, [de]
inc de inc de

View File

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

View File

@ -146,7 +146,7 @@ hRandom::
hRandomAdd:: db ; ffe1 hRandomAdd:: db ; ffe1
hRandomSub:: db ; ffe2 hRandomSub:: db ; ffe2
hSecondsBackup:: db ; ffe3 hUnusedBackup:: db ; ffe3
hBattleTurn:: ; ffe4 hBattleTurn:: ; ffe4
; Which trainer's turn is it? 0: player, 1: opponent trainer ; Which trainer's turn is it? 0: player, 1: opponent trainer