From 36f8cd1477b8ebe0537e99abd3ba53471a2e16c4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 4 Jul 2020 16:16:29 -0400 Subject: UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET_PAL_DEFAULT --- constants/palette_constants.asm | 3 ++- engine/gfx/palettes.asm | 10 +++++----- engine/menus/party_menu.asm | 2 +- home.asm | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 567c3cfc..c0c397ee 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -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 diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 9ec0f04a..58e08e86 100755 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -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 diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index b64c1af8..9ae5706e 100755 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -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] diff --git a/home.asm b/home.asm index 8507bf0d..19101c9a 100644 --- a/home.asm +++ b/home.asm @@ -1654,7 +1654,7 @@ GBPalWhiteOut:: ret RunDefaultPaletteCommand:: - ld b, $ff + ld b, SET_PAL_DEFAULT RunPaletteCommand:: ld a, [wOnSGB] and a -- cgit v1.2.3