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
..
footprint.png	Added footprints for the Gen. 4 species	2020-10-27 09:38:04 -03:00