Merge branch 'master' into master

This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions

View file

@ -85,6 +85,8 @@ INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pikachu/shiny.pal"
INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/raichu/shiny.pal"
INCBIN "gfx/pokemon/gorochu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gorochu/shiny.pal"
INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sandshrew/shiny.pal"
INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors