Eduardo Quezada d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h		2022-12-22 10:30:01 -03:00
..
anim_front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
back.png
footprint.png
front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
icon.png
normal.pal	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
shiny.pal