Merge branch 'mistress' into renewables

This commit is contained in:
Thorn Avery 2024-11-28 10:08:13 +11:00
commit 02536e80ac
65 changed files with 3761 additions and 394 deletions

View file

@ -50,7 +50,13 @@ DisplayListMenuID::
ld [wTopMenuItemY], a
ld a, 5
ld [wTopMenuItemX], a
ld a, A_BUTTON | B_BUTTON | SELECT | START
ld a, [wFlags_0xcd60]
ld b, a
ld a, A_BUTTON | B_BUTTON | SELECT
bit 2, b
jr z, .noSortingOption
or a, START
.noSortingOption
ld [wMenuWatchedKeys], a
ld c, 10
call DelayFrames

View file

@ -39,9 +39,18 @@ LoadHpBarAndStatusTilePatterns::
ld de, vChars2 tile $62
ld bc, HpBarAndStatusGraphicsEnd - HpBarAndStatusGraphics
ld a, BANK(HpBarAndStatusGraphics)
call FarCopyData ; if LCD is off, transfer all at once
ld hl, EXPBarGraphics
ld de, vChars1 tile $40
ld bc, EXPBarGraphicsEnd - EXPBarGraphics
ld a, BANK(EXPBarGraphics)
jp FarCopyData2 ; if LCD is off, transfer all at once
.on
ld de, HpBarAndStatusGraphics
ld hl, vChars2 tile $62
lb bc, BANK(HpBarAndStatusGraphics), (HpBarAndStatusGraphicsEnd - HpBarAndStatusGraphics) / $10
call CopyVideoData ; if LCD is on, transfer during V-blank
ld hl, EXPBarGraphics
ld de, vChars1 tile $40
lb bc, BANK(EXPBarGraphics), (EXPBarGraphicsEnd - EXPBarGraphics) / $10
jp CopyVideoData ; if LCD is on, transfer during V-blank