summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/pics/palette_pointers.asm33
-rw-r--r--gfx/trainers/palette_pointers.asm15
2 files changed, 48 insertions, 0 deletions
diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm
index fbac16ef7..17b586109 100644
--- a/gfx/pics/palette_pointers.asm
+++ b/gfx/pics/palette_pointers.asm
@@ -1,3 +1,5 @@
+PokemonPalettes: ; a8d6
+
BulbasaurPalette: INCLUDE "gfx/pics/001/normal.pal"
BulbasaurShinyPalette: INCLUDE "gfx/pics/001/shiny.pal"
IvysaurPalette: INCLUDE "gfx/pics/002/normal.pal"
@@ -500,3 +502,34 @@ HoOhPalette: INCLUDE "gfx/pics/250/normal.pal"
HoOhShinyPalette: INCLUDE "gfx/pics/250/shiny.pal"
CelebiPalette: INCLUDE "gfx/pics/251/normal.pal"
CelebiShinyPalette: INCLUDE "gfx/pics/251/shiny.pal"
+
+; 252
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+; 252 shiny
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+
+; Egg
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+; Egg shiny
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+
+; 254
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+; 254 shiny
+ RGB 30, 26, 11
+ RGB 23, 16, 00
+
+; 255
+ RGB 23, 23, 23
+ RGB 17, 17, 17
+; 255 shiny
+ RGB 23, 23, 23
+ RGB 17, 17, 17
+
+; b0ce
+
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
index f96ed5143..0c8627204 100644
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainers/palette_pointers.asm
@@ -1,3 +1,16 @@
+
+TrainerPalettes: ; b0ce
+
+PlayerPalette: ; b0ce
+; The player's palette
+ RGB 25, 18, 12
+ RGB 22, 09, 05
+
+KrisPalette: ; b0d0
+; Apparently Kris uses Falkner's palette
+; RGB 27, 17, 14
+; RGB 07, 05, 31
+
FalknerPalette: INCLUDE "gfx/trainers/000.pal"
WhitneyPalette: INCLUDE "gfx/trainers/001.pal"
BugsyPalette: INCLUDE "gfx/trainers/002.pal"
@@ -65,3 +78,5 @@ BluePalette: INCLUDE "gfx/trainers/063.pal"
OfficerPalette: INCLUDE "gfx/trainers/064.pal"
GruntfPalette: INCLUDE "gfx/trainers/065.pal"
MysticalmanPalette: INCLUDE "gfx/trainers/066.pal"
+; b1de
+