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	Species Simplifier™ - Part 3 (#3562)	2023-12-08 15:05:10 +01:00
begin_battle.c	Species Simplifier™ - Part 3 (#3562)	2023-12-08 15:05:10 +01:00
faint.c	Species Simplifier™ - Part 3 (#3562)	2023-12-08 15:05:10 +01:00
mega_evolution.c	Move data unification (#3999)	2024-01-29 08:51:32 -03:00
primal_reversion.c	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-09 17:02:56 -03:00
status.c	Tweaked helper functions	2023-12-30 17:42:53 +09:00
ultra_burst.c	Move data unification (#3999)	2024-01-29 08:51:32 -03:00