67f1772f1e
# Conflicts: # src/battle_util.c # test/battle/item_effect/heal_and_cure_status.c |
||
---|---|---|
.. | ||
battle | ||
dynamax.c | ||
fpmath.c | ||
pokemon.c | ||
random.c | ||
species.c | ||
sprite.c | ||
test_runner.c | ||
test_runner_args.c | ||
test_runner_battle.c |