Eduardo Quezada 3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/event_object_movement.h # src/data.c # src/data/graphics/pokemon.h # src/data/pokemon/species_info/gen_4_families.h		2024-04-20 13:23:14 -04:00
..
hisuian	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-04-20 13:23:14 -04:00
anim_front.png
back.png
follower.png	Moved follower sprites to graphics/pokemon folder	2024-01-23 14:04:16 -03:00
footprint.png	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602	2023-06-02 11:45:28 -04:00
icon.png
normal.pal
shiny.pal