diff options
| -rwxr-xr-x | constants/scgb_constants.asm | 32 | ||||
| -rw-r--r-- | engine/cgb_layouts.asm | 2 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rw-r--r-- | gfx/sgb/pal_packets.asm | 4 | ||||
| -rw-r--r-- | gfx/sgb/predef.pal | 28 |
5 files changed, 34 insertions, 34 deletions
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 88c96f90f..4f68fdfd2 100755 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -65,22 +65,22 @@ SCGB_RAM EQU -1 const PREDEFPAL_DUNGEONS const PREDEFPAL_NITE const PREDEFPAL_BLACKOUT - const PREDEFPAL_DIPLOMA - const PREDEFPAL_TRADE_TUBE - const PREDEFPAL_POKEDEX - const PREDEFPAL_1E - const PREDEFPAL_1F - const PREDEFPAL_20 - const PREDEFPAL_21 - const PREDEFPAL_22 - const PREDEFPAL_23 - const PREDEFPAL_BADGE - const PREDEFPAL_25 - const PREDEFPAL_26 - const PREDEFPAL_27 - const PREDEFPAL_28 - const PREDEFPAL_29 - const PREDEFPAL_2A + const PREDEFPAL_DIPLOMA ; RB_MEWMON + const PREDEFPAL_TRADE_TUBE ; RB_BLUEMON + const PREDEFPAL_POKEDEX ; RB_REDMON + const PREDEFPAL_RB_CYANMON + const PREDEFPAL_RB_PURPLEMON + const PREDEFPAL_RB_BROWNMON + const PREDEFPAL_RB_GREENMON + 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 diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 775db1b70..96289a4c7 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -685,7 +685,7 @@ _CGB_TrainerCard: ; 9289 ld a, PRYCE call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, PREDEFPAL_BADGE + ld a, PREDEFPAL_CGB_BADGE call GetPredefPal call LoadHLPaletteIntoDE diff --git a/engine/color.asm b/engine/color.asm index bdac2b97f..d8814bf3a 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -768,7 +768,7 @@ Unreferenced_Function97cc: ld a, PREDEFPAL_TRADE_TUBE call GetPredefPal call .PushPalette - ld a, PREDEFPAL_21 + ld a, PREDEFPAL_RB_GREENMON call GetPredefPal call .PushPalette ret diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 95a224f2b..ec97bca3d 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, BADGE, 20, 00 + sgb_pal_set 2B, CGB_BADGE, RB_BROWNMON, 00 PalPacket_SCGB_11: sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 @@ -69,7 +69,7 @@ PalPacket_SlotMachine: sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 PalPacket_SCGB_06: - sgb_pal_set 33, 34, DIPLOMA, 1F + sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON PalPacket_Diploma: sgb_pal_set DIPLOMA, 00, 00, 00 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 27094f292..1f18f9efe 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -28,19 +28,19 @@ RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA RGB 31,31,31, 18,20,27, 11,15,23, 00,00,00 ; PREDEFPAL_TRADE_TUBE RGB 31,31,31, 31,20,10, 26,10,06, 00,00,00 ; PREDEFPAL_POKEDEX - RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_1E - RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_1F - RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_20 - RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_21 - RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_22 - RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_23 - RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_BADGE - RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_25 - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_26 - RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_27 - RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_28 - RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_29 - RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_2A + RGB 31,31,31, 21,25,29, 14,19,25, 00,00,00 ; PREDEFPAL_RB_CYANMON + RGB 31,31,31, 27,22,24, 21,15,23, 00,00,00 ; PREDEFPAL_RB_PURPLEMON + RGB 31,31,31, 28,20,15, 21,14,09, 00,00,00 ; PREDEFPAL_RB_BROWNMON + RGB 31,31,31, 20,26,16, 09,20,11, 00,00,00 ; PREDEFPAL_RB_GREENMON + 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 @@ -58,7 +58,7 @@ RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B - RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD + RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_BG (PACK) RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 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 |