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
..
wooper_paldean	Add further icon sprite changes and fixes (#4413)	2024-04-20 09:41:01 +02:00
anim_front.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
anim_frontf.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
back.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
backf.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
follower.png	Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo	2024-03-25 16:03:56 -03:00
footprint.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
icon.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
normal.pal	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00
shiny.pal	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -03:00