More .pal files

This commit is contained in:
Remy Oukaour 2018-01-18 11:37:05 -05:00
parent 226d1812b3
commit 22fd1221f5
8 changed files with 26 additions and 24 deletions

View File

@ -103,10 +103,10 @@ SCGB_RAM EQU -1
const PREDEFPAL_SLOT_MACHINE_1 const PREDEFPAL_SLOT_MACHINE_1
const PREDEFPAL_SLOT_MACHINE_2 const PREDEFPAL_SLOT_MACHINE_2
const PREDEFPAL_SLOT_MACHINE_3 const PREDEFPAL_SLOT_MACHINE_3
const PREDEFPAL_41 const PREDEFPAL_SCGB_11_0
const PREDEFPAL_42 const PREDEFPAL_SCGB_11_1
const PREDEFPAL_43 const PREDEFPAL_SCGB_11_2
const PREDEFPAL_44 const PREDEFPAL_SCGB_11_3
const PREDEFPAL_45 const PREDEFPAL_45
const PREDEFPAL_46 const PREDEFPAL_46
const PREDEFPAL_47 const PREDEFPAL_47

View File

@ -158,9 +158,9 @@ _CGB_FinishBattleScreenLayout: ; 8e23
InitPartyMenuBGPal7: ; 8e85 InitPartyMenuBGPal7: ; 8e85
farcall Function100dc0 farcall Function100dc0
Mobile_InitPartyMenuBGPal7: ; 8e8b Mobile_InitPartyMenuBGPal7: ; 8e8b
ld hl, Palette_b311 ld hl, PartyMenuBGPalette
jr nc, .not_mobile jr nc, .not_mobile
ld hl, Palette_b309 ld hl, PartyMenuBGMobilePalette
.not_mobile .not_mobile
ld de, wBGPals1 palette 7 ld de, wBGPals1 palette 7
ld bc, 1 palettes ld bc, 1 palettes
@ -171,9 +171,9 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b
InitPartyMenuBGPal0: ; 8e9f InitPartyMenuBGPal0: ; 8e9f
farcall Function100dc0 farcall Function100dc0
ld hl, Palette_b311 ld hl, PartyMenuBGPalette
jr nc, .not_mobile jr nc, .not_mobile
ld hl, Palette_b309 ld hl, PartyMenuBGMobilePalette
.not_mobile .not_mobile
ld de, wBGPals1 palette 0 ld de, wBGPals1 palette 0
ld bc, 1 palettes ld bc, 1 palettes

View File

@ -1315,17 +1315,11 @@ endr
INCLUDE "data/maps/environment_colors.asm" INCLUDE "data/maps/environment_colors.asm"
Palette_b309: ; b309 mobile PartyMenuBGMobilePalette:
RGB 31, 31, 31 INCLUDE "gfx/stats/party_menu_bg_mobile.pal"
RGB 31, 19, 24
RGB 30, 10, 06
RGB 00, 00, 00
Palette_b311: ; b311 not mobile PartyMenuBGPalette:
RGB 31, 31, 31 INCLUDE "gfx/stats/party_menu_bg.pal"
RGB 17, 19, 31
RGB 14, 16, 31
RGB 00, 00, 00
TilesetBGPalette: TilesetBGPalette:
INCLUDE "gfx/tilesets/bg_tiles.pal" INCLUDE "gfx/tilesets/bg_tiles.pal"
@ -1340,7 +1334,7 @@ DiplomaPalettes:
INCLUDE "gfx/diploma/diploma.pal" INCLUDE "gfx/diploma/diploma.pal"
PartyMenuOBPals: PartyMenuOBPals:
INCLUDE "gfx/icons/party_menu.pal" INCLUDE "gfx/stats/party_menu_ob.pal"
UnusedGSTitleBGPals: UnusedGSTitleBGPals:
INCLUDE "gfx/title/unused_gs_bg.pal" INCLUDE "gfx/title/unused_gs_bg.pal"

View File

@ -24,7 +24,7 @@ PalPacket_SCGB_13:
sgb_pal_set 2B, BADGE, 20, 00 sgb_pal_set 2B, BADGE, 20, 00
PalPacket_SCGB_11: PalPacket_SCGB_11:
sgb_pal_set 41, 42, 43, 44 sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3
PalPacket_UnownPuzzle: PalPacket_UnownPuzzle:
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE

View File

@ -63,10 +63,10 @@
RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2
RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3 RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3
RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_41 RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0
RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_42 RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1
RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_43 RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2
RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_44 RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3
RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45 RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45
RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46 RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46
RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47 RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47

View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 17, 19, 31
RGB 14, 16, 31
RGB 00, 00, 00

View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 31, 19, 24
RGB 30, 10, 06
RGB 00, 00, 00