diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 27ea7ca4d..e31a2139f 100755 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -75,16 +75,16 @@ SCGB_RAM EQU -1 const PREDEFPAL_RB_PINKMON const PREDEFPAL_RB_YELLOWMON const PREDEFPAL_CGB_BADGE ; RB_GREYMON - const PREDEFPAL_DARK_MEW - const PREDEFPAL_DARK_BLUE - const PREDEFPAL_DARK_RED - const PREDEFPAL_DARK_CYAN - const PREDEFPAL_DARK_PURPLE - const PREDEFPAL_DARK_BROWN - const PREDEFPAL_2B - const PREDEFPAL_2C - const PREDEFPAL_2D - const PREDEFPAL_PARTY_ICON + const PREDEFPAL_MEWMON_NITE + const PREDEFPAL_BLUEMON_NITE + const PREDEFPAL_REDMON_NITE + const PREDEFPAL_CYANMON_NITE + const PREDEFPAL_PURPLEMON_NITE + const PREDEFPAL_BROWNMON_NITE + const PREDEFPAL_GREENMON_NITE + const PREDEFPAL_PINKMON_NITE + const PREDEFPAL_YELLOWMON_NITE + const PREDEFPAL_PARTY_ICON ; GREYMON_NITE const PREDEFPAL_HP_GREEN const PREDEFPAL_HP_YELLOW const PREDEFPAL_HP_RED diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 7028d24ae..fa3b386da 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -21,7 +21,7 @@ PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 PalPacket_SCGB_13: - sgb_pal_set 2B, CGB_BADGE, RB_BROWNMON, 00 + sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00 PalPacket_SCGB_11: sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index f0e6f3693..1faa115bf 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -35,15 +35,15 @@ RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE - RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_DARK_MEW - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_DARK_BLUE - RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_DARK_RED - RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_DARK_CYAN - RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_DARK_PURPLE - RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_DARK_BROWN - RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_2B - RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_2C - RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_2D + RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE + RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE + RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE + RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE + RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE + RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE + RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW