sovereignx/graphics/pokemon/ferrothorn/footprint.png at 3202625ca5618bf92fd6734ab85310769f98b11a

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