80b193280d
# Conflicts: # src/battle_main.c # src/data/item_icon_table.h # src/data/pokemon/species_info/gen_9_families.h |
||
---|---|---|
.. | ||
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 |