Eduardo Quezada 021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h

2024-05-28 14:28:33 -04:00

..

circled

Mon graphics are now loaded depending on their availability

2023-07-07 14:36:30 -04:00

double

Revert unneeded sprite changes from 3051 (#3205)

2023-08-25 16:33:15 -04:00

follower.png

Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-02-17 23:40:08 -03:00

footprint.png

Add Gen 9 and PLA footprints + update some footprints (#4621)

2024-05-26 22:20:51 +02:00

icon.png

Fixed SPECIES_NONE icon

2023-07-07 14:50:01 -04:00