4 commits

Author	SHA1	Message	Date
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
sneed	09bace2b26	fix cherrim sprite	2022-05-19 00:40:54 +03:00
DizzyEggg	54150e3794	Revert "Cherrim sun form gfx" ... This reverts commit cd09047c4f.	2019-06-15 14:16:11 +02:00
DizzyEggg	cd09047c4f	Cherrim sun form gfx	2019-06-10 11:16:52 +02:00