Eduardo Quezada 67f1772f1e Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # test/battle/item_effect/heal_and_cure_status.c		2024-02-09 17:02:56 -03:00
..
battle_switch.c
begin_battle.c
faint.c
mega_evolution.c
primal_reversion.c
status.c
ultra_burst.c