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 |
|