shithub: pokecrystal

--- a/FAQ.md

+++ b/FAQ.md

@@ -81,7 +81,7 @@

 Most `.png` images are paletted PNGs. You can edit these with any program that supports creating PNGs with palette information. These palettes should consist of exactly 4 colors. Additionally, for Pokémon images, the first color should be white, and the last black. Tools such as Paint and [GIMP](gimp) will do the right job, while other tools such as [paint.net](paintdotnet) or Photoshop might mess it up and output palettes of 255 colors even though only using 4. You may try using tools like [GraphicsGale](graphicsgale) or [IrfanView](irfanview) to fix this, or sometimes resaving the image in Paint seems to help.

-Some image `.png` files are greyscale. This indicates that even though these images do have proper colors in-game, they're shared with something else, and as such changing them will affect other things as well. Don't try opening the `.2bpp` files, these only contain the image data as well, not the palettes.

+Some image `.png` files are grayscale. This indicates that even though these images do have proper colors in-game, they're shared with something else, and as such changing them will affect other things as well. Don't try opening the `.2bpp` files, these only contain the image data as well, not the palettes.

 It really depends on what image you're trying to change the colors of, where these colors are specified. Try looking for related files or `.pal` files.

--- a/constants/scgb_constants.asm

+++ b/constants/scgb_constants.asm

@@ -80,7 +80,7 @@

 	const PREDEFPAL_RB_GREENMON

 	const PREDEFPAL_RB_PINKMON

 	const PREDEFPAL_RB_YELLOWMON

-	const PREDEFPAL_CGB_BADGE ; RB_GREYMON

+	const PREDEFPAL_CGB_BADGE ; RB_GRAYMON

 	const PREDEFPAL_BETA_SHINY_MEWMON

 	const PREDEFPAL_BETA_SHINY_BLUEMON

 	const PREDEFPAL_BETA_SHINY_REDMON

@@ -90,7 +90,7 @@

 	const PREDEFPAL_BETA_SHINY_GREENMON

 	const PREDEFPAL_BETA_SHINY_PINKMON

 	const PREDEFPAL_BETA_SHINY_YELLOWMON

-	const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GREYMON

+	const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GRAYMON

 	const PREDEFPAL_HP_GREEN

 	const PREDEFPAL_HP_YELLOW

 	const PREDEFPAL_HP_RED

--- a/engine/battle/core.asm

+++ b/engine/battle/core.asm

@@ -2954,7 +2954,7 @@

 	and a

 	jr nz, .LostLinkBattle

-; Greyscale

+; Grayscale

 	ld b, SCGB_BATTLE_GRAYSCALE

 	call GetSGBLayout

 	call SetPalettes