diff options
| author | yenatch <yenatch@gmail.com> | 2014-04-13 00:03:21 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-04-13 00:03:21 -0400 |
| commit | 113dd395d246de4f15f9a9ebe6124ce8d54cdaa1 (patch) | |
| tree | cd90f22aaaf402c286b9f6463abc0d8c8760274a | |
| parent | 266087909bfe28002bf81f632f8c372d10fcdee9 (diff) | |
| download | pokecrystal-113dd395d246de4f15f9a9ebe6124ce8d54cdaa1.tar.gz pokecrystal-113dd395d246de4f15f9a9ebe6124ce8d54cdaa1.zip | |
Include palette 0 in PokemonPalettes.
Now PokemonPalettes is referenced.
| -rw-r--r-- | engine/color.asm | 11 | ||||
| -rw-r--r-- | gfx/pics/palette_pointers.asm | 9 | ||||
| -rw-r--r-- | predef/sgb.asm | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engine/color.asm b/engine/color.asm index 0fd85de1..fbbc4514 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 880cc673..eb8814f2 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 c7da48da..382c1c66 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 |