pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Identify leftover SGB palettes from R/B

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-18 12:31:19 -05:00
parent f556ab9a4c
commit 69ace7f48d
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
constants/scgb_constants.asm
View File

@@ -65,22 +65,22 @@ SCGB_RAM EQU -1
const PREDEFPAL_DUNGEONS const PREDEFPAL_DUNGEONS
const PREDEFPAL_NITE const PREDEFPAL_NITE
const PREDEFPAL_BLACKOUT const PREDEFPAL_BLACKOUT
const PREDEFPAL_DIPLOMA const PREDEFPAL_DIPLOMA ; RB_MEWMON
const PREDEFPAL_TRADE_TUBE const PREDEFPAL_TRADE_TUBE ; RB_BLUEMON
const PREDEFPAL_POKEDEX const PREDEFPAL_POKEDEX ; RB_REDMON
const PREDEFPAL_1E const PREDEFPAL_RB_CYANMON
const PREDEFPAL_1F const PREDEFPAL_RB_PURPLEMON
const PREDEFPAL_20 const PREDEFPAL_RB_BROWNMON
const PREDEFPAL_21 const PREDEFPAL_RB_GREENMON
const PREDEFPAL_22 const PREDEFPAL_RB_PINKMON
const PREDEFPAL_23 const PREDEFPAL_RB_YELLOWMON
const PREDEFPAL_BADGE const PREDEFPAL_CGB_BADGE ; RB_GREYMON
const PREDEFPAL_25 const PREDEFPAL_DARK_MEW
const PREDEFPAL_26 const PREDEFPAL_DARK_BLUE
const PREDEFPAL_27 const PREDEFPAL_DARK_RED
const PREDEFPAL_28 const PREDEFPAL_DARK_CYAN
const PREDEFPAL_29 const PREDEFPAL_DARK_PURPLE
const PREDEFPAL_2A const PREDEFPAL_DARK_BROWN
const PREDEFPAL_2B const PREDEFPAL_2B
const PREDEFPAL_2C const PREDEFPAL_2C
const PREDEFPAL_2D const PREDEFPAL_2D

2
engine/cgb_layouts.asm
View File

@@ -685,7 +685,7 @@ _CGB_TrainerCard: ; 9289
ld a, PRYCE ld a, PRYCE
call GetTrainerPalettePointer call GetTrainerPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
ld a, PREDEFPAL_BADGE ld a, PREDEFPAL_CGB_BADGE
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE

2
engine/color.asm
View File

@@ -768,7 +768,7 @@ Unreferenced_Function97cc:
ld a, PREDEFPAL_TRADE_TUBE ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal call GetPredefPal
call .PushPalette call .PushPalette
ld a, PREDEFPAL_21 ld a, PREDEFPAL_RB_GREENMON
call GetPredefPal call GetPredefPal
call .PushPalette call .PushPalette
ret ret

4
gfx/sgb/pal_packets.asm
View File

@@ -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 sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
PalPacket_SCGB_13: PalPacket_SCGB_13:
sgb_pal_set 2B, BADGE, 20, 00 sgb_pal_set 2B, CGB_BADGE, RB_BROWNMON, 00
PalPacket_SCGB_11: PalPacket_SCGB_11:
sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 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 sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
PalPacket_SCGB_06: PalPacket_SCGB_06:
sgb_pal_set 33, 34, DIPLOMA, 1F sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON
PalPacket_Diploma: PalPacket_Diploma:
sgb_pal_set DIPLOMA, 00, 00, 00 sgb_pal_set DIPLOMA, 00, 00, 00

28
gfx/sgb/predef.pal
View File

@@ -28,19 +28,19 @@
RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA 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, 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, 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, 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_1F 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_20 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_21 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_22 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_23 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_BADGE 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_25 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_26 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_27 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_28 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_29 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_2A 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, 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, 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, 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, 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, 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, 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, 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, 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