ref: 22fd1221f5189e9d1d4e1ebd2146f7aaf77f2e3a
parent: 226d1812b34dad7ee0bb758c4c4970a731c9c79e
author: Remy Oukaour <[email protected]>
date: Thu Jan 18 06:37:05 EST 2018
More .pal files
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -103,10 +103,10 @@
const PREDEFPAL_SLOT_MACHINE_1
const PREDEFPAL_SLOT_MACHINE_2
const PREDEFPAL_SLOT_MACHINE_3
- const PREDEFPAL_41
- const PREDEFPAL_42
- const PREDEFPAL_43
- const PREDEFPAL_44
+ const PREDEFPAL_SCGB_11_0
+ const PREDEFPAL_SCGB_11_1
+ const PREDEFPAL_SCGB_11_2
+ const PREDEFPAL_SCGB_11_3
const PREDEFPAL_45
const PREDEFPAL_46
const PREDEFPAL_47
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -158,9 +158,9 @@
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 @@
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
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1315,17 +1315,11 @@
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 @@
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"
--- a/gfx/icons/party_menu.pal
+++ /dev/null
@@ -1,69 +1,0 @@
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 10, 14, 20
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 27, 31, 27
- RGB 31, 19, 10
- RGB 31, 07, 04
- RGB 00, 00, 00
-
- RGB 31, 31, 31
- RGB 21, 21, 21
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 12, 25, 01
- RGB 05, 14, 00
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 08, 12, 31
- RGB 01, 04, 31
- RGB 07, 07, 07
-
- RGB 31, 31, 31
- RGB 24, 18, 07
- RGB 20, 15, 03
- RGB 07, 07, 07
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -24,7 +24,7 @@
sgb_pal_set 2B, BADGE, 20, 00
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:
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -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, 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, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_41
- RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_42
- RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_43
- RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_44
+ 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_SCGB_11_1
+ 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_SCGB_11_3
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, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47
--- /dev/null
+++ b/gfx/stats/party_menu_bg.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 17, 19, 31
+ RGB 14, 16, 31
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/stats/party_menu_bg_mobile.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/stats/party_menu_ob.pal
@@ -1,0 +1,69 @@
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 10, 14, 20
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 27, 31, 27
+ RGB 31, 19, 10
+ RGB 31, 07, 04
+ RGB 00, 00, 00
+
+ RGB 31, 31, 31
+ RGB 21, 21, 21
+ RGB 13, 13, 13
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 31, 31, 07
+ RGB 31, 16, 01
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 31, 19, 24
+ RGB 30, 10, 06
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 12, 25, 01
+ RGB 05, 14, 00
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 08, 12, 31
+ RGB 01, 04, 31
+ RGB 07, 07, 07
+
+ RGB 31, 31, 31
+ RGB 24, 18, 07
+ RGB 20, 15, 03
+ RGB 07, 07, 07