Eduardo Quezada 98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c

2024-07-19 09:20:05 -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

fix tests when B_USE_FROSTBITE is TRUE (#4986)

2024-07-17 23:23:52 +02:00

ultra_burst.c

Gimmick Refactor (#4449)

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