Eduardo Quezada D'Ottone 0c6dc6abab Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # graphics/pokemon/burmy/footprint.png # graphics/pokemon/gastrodon/footprint.png # graphics/pokemon/rotom/footprint.png # graphics/pokemon/shellos/footprint.png # graphics/pokemon/wormadam/footprint.png # include/constants/species.h # src/data/pokemon/base_stats.h		2020-11-03 00:13:51 -03:00
..
pirouette	Added Ultimasoul's Forms from his FromID system.	2020-10-23 11:44:47 -03:00
back.png	Gen5 sprites and icon placeholder data	2019-04-04 12:57:01 +02:00
footprint.png	Added footprints for the Gen. 5 species, thanks to Blackforest	2020-11-01 09:44:05 -03:00
front.png	Gen5 sprites and icon placeholder data	2019-04-04 12:57:01 +02:00
icon.png	Add icons for gen1-gen6 mons	2019-04-11 18:20:03 +02:00
normal.pal	Gen5 sprites and icon placeholder data	2019-04-04 12:57:01 +02:00
shiny.pal	Gen5 sprites and icon placeholder data	2019-04-04 12:57:01 +02:00