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
..
back.png	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
follow_normal.pal	Hisuian Mon	2024-05-12 10:54:45 -04:00
follow_shiny.pal	Hisuian Mon	2024-05-12 10:54:45 -04:00
follower.png	Hisuian Mon	2024-05-12 10:54:45 -04:00
footprint.png	Add Gen 9 and PLA footprints + update some footprints (#4621)	2024-05-26 22:20:51 +02:00
front.png	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
icon.png	Update almost all Gen 9 icon sprites + add the missing ones (#4290)	2024-04-06 11:26:16 +02:00
normal.pal	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
shiny.pal	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00