ref: 113dd395d246de4f15f9a9ebe6124ce8d54cdaa1
parent: 266087909bfe28002bf81f632f8c372d10fcdee9
author: yenatch <[email protected]>
date: Sat Apr 12 20:03:21 EDT 2014
Include palette 0 in PokemonPalettes. Now PokemonPalettes is referenced.
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1927,16 +1927,9 @@
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
--- 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"
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -464,7 +464,7 @@
add hl, hl
add hl, hl
add hl, hl
- ld de, Palettes_a8ce
+ ld de, PokemonPalettes
add hl, de
ld a, [$cf65]
and 3