diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-18 11:37:05 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-18 11:37:05 -0500 |
| commit | 22fd1221f5189e9d1d4e1ebd2146f7aaf77f2e3a (patch) | |
| tree | c71d3dad6cd126c9ef16dd29f10720a258adb198 /engine | |
| parent | 226d1812b34dad7ee0bb758c4c4970a731c9c79e (diff) | |
More .pal files
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/cgb_layouts.asm | 8 | ||||
| -rw-r--r-- | engine/color.asm | 16 |
2 files changed, 9 insertions, 15 deletions
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 908762520..775db1b70 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -158,9 +158,9 @@ _CGB_FinishBattleScreenLayout: ; 8e23 InitPartyMenuBGPal7: ; 8e85 farcall Function100dc0 Mobile_InitPartyMenuBGPal7: ; 8e8b - ld hl, Palette_b311 + ld hl, PartyMenuBGPalette jr nc, .not_mobile - ld hl, Palette_b309 + ld hl, PartyMenuBGMobilePalette .not_mobile ld de, wBGPals1 palette 7 ld bc, 1 palettes @@ -171,9 +171,9 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b InitPartyMenuBGPal0: ; 8e9f farcall Function100dc0 - ld hl, Palette_b311 + ld hl, PartyMenuBGPalette jr nc, .not_mobile - ld hl, Palette_b309 + ld hl, PartyMenuBGMobilePalette .not_mobile ld de, wBGPals1 palette 0 ld bc, 1 palettes diff --git a/engine/color.asm b/engine/color.asm index 870dfd85b..bdac2b97f 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1315,17 +1315,11 @@ endr INCLUDE "data/maps/environment_colors.asm" -Palette_b309: ; b309 mobile - RGB 31, 31, 31 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 00, 00, 00 +PartyMenuBGMobilePalette: +INCLUDE "gfx/stats/party_menu_bg_mobile.pal" -Palette_b311: ; b311 not mobile - RGB 31, 31, 31 - RGB 17, 19, 31 - RGB 14, 16, 31 - RGB 00, 00, 00 +PartyMenuBGPalette: +INCLUDE "gfx/stats/party_menu_bg.pal" TilesetBGPalette: INCLUDE "gfx/tilesets/bg_tiles.pal" @@ -1340,7 +1334,7 @@ DiplomaPalettes: INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: -INCLUDE "gfx/icons/party_menu.pal" +INCLUDE "gfx/stats/party_menu_ob.pal" UnusedGSTitleBGPals: INCLUDE "gfx/title/unused_gs_bg.pal" |