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
..
anim_front.png
back.png
follow_normal.pal	Added separate palette data for followers	2024-04-20 18:35:55 -04:00
follow_shiny.pal	Added separate palette data for followers	2024-04-20 18:35:55 -04:00
follower.png	Added separate palette data for followers	2024-04-20 18:35:55 -04:00
footprint.png	Add Gen 9 and PLA footprints + update some footprints (#4621)	2024-05-26 22:20:51 +02:00
icon.png
normal.pal
shiny.pal