mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-21 12:26:07 -05:00
# 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 |
||
|---|---|---|
| .. | ||
| covert_cloak.c | ||
| cure_status.c | ||
| escape.c | ||
| heal_and_cure_status.c | ||
| increase_stat.c | ||
| restore_hp.c | ||
| restore_pp.c | ||
| revive.c | ||
| set_mist.c | ||
| throw_ball.c | ||