fcdc9ed65a
# 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 |
||
|---|---|---|
| .. | ||
| electric.c | ||
| grassy.c | ||
| misty.c | ||
| psychic.c | ||
| starting_terrain.c | ||