UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET_PAL_DEFAULT

This commit is contained in:
Rangi 2020-07-04 16:16:29 -04:00
parent 73be62fad6
commit 36f8cd1477
4 changed files with 9 additions and 8 deletions

View file

@ -22,7 +22,8 @@
const SET_PAL_GAME_FREAK_INTRO ; $0C
const SET_PAL_TRAINER_CARD ; $0D
UPDATE_PARTY_MENU_BLK_PACKET EQU $fc
SET_PAL_PARTY_MENU_HP_BARS EQU $fc
SET_PAL_DEFAULT EQU $ff
; sgb palettes
const_def

View file

@ -1,11 +1,11 @@
_RunPaletteCommand:
call GetPredefRegisters
ld a, b
cp $ff
jr nz, .next
ld a, [wDefaultPaletteCommand] ; use default command if command ID is $ff
.next
cp UPDATE_PARTY_MENU_BLK_PACKET
cp SET_PAL_DEFAULT
jr nz, .not_default
ld a, [wDefaultPaletteCommand]
.not_default
cp SET_PAL_PARTY_MENU_HP_BARS
jp z, UpdatePartyMenuBlkPacket
ld l, a
ld h, 0

View file

@ -318,7 +318,7 @@ SetPartyMenuHPBarColor:
ld b, 0
add hl, bc
call GetHealthBarColor
ld b, UPDATE_PARTY_MENU_BLK_PACKET
ld b, SET_PAL_PARTY_MENU_HP_BARS
call RunPaletteCommand
ld hl, wWhichPartyMenuHPBar
inc [hl]

View file

@ -1654,7 +1654,7 @@ GBPalWhiteOut::
ret
RunDefaultPaletteCommand::
ld b, $ff
ld b, SET_PAL_DEFAULT
RunPaletteCommand::
ld a, [wOnSGB]
and a