From 113dd395d246de4f15f9a9ebe6124ce8d54cdaa1 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 13 Apr 2014 00:03:21 -0400
Subject: [PATCH] Include palette 0 in PokemonPalettes.

Now PokemonPalettes is referenced.
---
 engine/color.asm              | 11 ++---------
 gfx/pics/palette_pointers.asm |  9 ++++++++-
 predef/sgb.asm                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/color.asm b/engine/color.asm
index 0fd85de15..fbbc45144 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1927,16 +1927,9 @@ Palettes_a8be: ; a8be
 Palettes_a8ca: ; a8ca
 	RGB 30, 26, 15
 	RGB 04, 17, 31
+; a8ce
 
-Palettes_a8ce: ; a8ce
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-
-	RGB 30, 22, 17
-	RGB 16, 14, 19
-; a8d6
-
-; a8d6
+; a8ce
 INCLUDE "gfx/pics/palette_pointers.asm"
 ; b0ce
 
diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm
index 880cc6731..eb8814f22 100644
--- a/gfx/pics/palette_pointers.asm
+++ b/gfx/pics/palette_pointers.asm
@@ -1,4 +1,11 @@
-PokemonPalettes: ; a8d6
+PokemonPalettes: ; a8ce
+
+; 000
+	RGB 30, 22, 17
+	RGB 16, 14, 19
+; 000 shiny
+	RGB 30, 22, 17
+	RGB 16, 14, 19
 
 BulbasaurPalette:       INCLUDE "gfx/pics/bulbasaur/normal.pal"
 BulbasaurShinyPalette:  INCLUDE "gfx/pics/bulbasaur/shiny.pal"
diff --git a/predef/sgb.asm b/predef/sgb.asm
index c7da48da2..382c1c666 100644
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -464,7 +464,7 @@ Function8969: ; 8969
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld de, Palettes_a8ce
+	ld de, PokemonPalettes
 	add hl, de
 	ld a, [$cf65]
 	and 3