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
..
anim_front.png	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2	2022-09-13 20:44:49 -03:00
back.png	fix cherrim sprite	2022-05-19 00:40:54 +03:00
front.png	fix cherrim sprite	2022-05-19 00:40:54 +03:00
normal.pal	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2	2022-09-13 20:44:49 -03:00
shiny.pal	fix cherrim sprite	2022-05-19 00:40:54 +03:00