Commit Graph

2 Commits

Author SHA1 Message Date
Eduardo Quezada
4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
# Conflicts:
#	graphics/pokemon/mawile/footprint.png
#	src/battle_gfx_sfx_util.c
#	src/fldeff_sweetscent.c
#	src/pokedex.c
2023-06-02 11:45:28 -04:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00