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

Include palette 0 in PokemonPalettes.

Browse Source 
Now PokemonPalettes is referenced.
This commit is contained in:
yenatch
2014-04-13 00:03:21 -04:00
parent 266087909b
commit 113dd395d2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/color.asm
View File

@@ -1927,16 +1927,9 @@ Palettes_a8be: ; a8be
Palettes_a8ca: ; a8ca Palettes_a8ca: ; a8ca
RGB 30, 26, 15 RGB 30, 26, 15
RGB 04, 17, 31 RGB 04, 17, 31
; a8ce
Palettes_a8ce: ; a8ce ; a8ce
RGB 30, 22, 17
RGB 16, 14, 19
RGB 30, 22, 17
RGB 16, 14, 19
; a8d6
; a8d6
INCLUDE "gfx/pics/palette_pointers.asm" INCLUDE "gfx/pics/palette_pointers.asm"
; b0ce ; b0ce

9
gfx/pics/palette_pointers.asm
View File

@@ -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" BulbasaurPalette: INCLUDE "gfx/pics/bulbasaur/normal.pal"
BulbasaurShinyPalette: INCLUDE "gfx/pics/bulbasaur/shiny.pal" BulbasaurShinyPalette: INCLUDE "gfx/pics/bulbasaur/shiny.pal"

2
predef/sgb.asm
View File

@@ -464,7 +464,7 @@ Function8969: ; 8969
add hl, hl add hl, hl
add hl, hl add hl, hl
add hl, hl add hl, hl
ld de, Palettes_a8ce ld de, PokemonPalettes
add hl, de add hl, de
ld a, [$cf65] ld a, [$cf65]
and 3 and 3