Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c		2024-07-05 14:25:25 -04:00
..
anim_front.png	Fixes (#4887)	2024-06-29 20:46:00 +02:00
back.png	Revert "Organized pokemon graphics by generation (#3868)" (#3959)	2024-01-10 15:49:58 -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
overworld.png	Split Pokémon Object Events from Following Pokémon functionality (#4761)	2024-06-13 22:46:27 +02:00
overworld_normal.pal	Split Pokémon Object Events from Following Pokémon functionality (#4761)	2024-06-13 22:46:27 +02:00
overworld_shiny.pal	Split Pokémon Object Events from Following Pokémon functionality (#4761)	2024-06-13 22:46:27 +02:00
shiny.pal	Fixes (#4887)	2024-06-29 20:46:00 +02:00