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

..

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

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-05 14:25:25 -04:00

primal_reversion.c

Add switching message macros for tests (#4717)

2024-06-03 19:59:28 -04:00

status.c

Opponents Shaymin Sky form correctly reverts on frozen status (#4559)

2024-05-14 13:28:10 +02:00

ultra_burst.c

Gimmick Refactor (#4449)

2024-06-22 22:25:40 +02:00