Eduardo Quezada 0caf79f702 Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 ... # Conflicts: # graphics/pokemon/cherrim/anim_front.png # graphics/pokemon/scyther/anim_front.png # graphics/pokemon/scyther/front.png # graphics/pokemon/shinx/anim_front.png # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c		2022-09-13 20:44:49 -03:00
..
mega	Fix multiple pokemon graphics, tidying pokemon graphic folders	2022-07-22 22:17:29 +07:00
anim_front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
back.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
footprint.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
front.png	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
icon.png	Revert "Fix the 'bKGD: invalid index' error"	2021-10-17 07:32:49 -03:00
normal.pal	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
shiny.pal	Fix and Update Pokemon Sprites (#489)	2020-08-27 09:52:42 +02:00