Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ...

Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c

2025-05-28 14:26:15 +02:00

..

battle

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00

daycare.c

Fixed non-regional forms breeding incorrectly (#4985)

2025-02-03 17:03:29 +01:00

fpmath.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

pokemon.c

Changed Tackle for Scratch in tests (#6730)

2025-04-30 17:18:52 -04:00

random.c

Remove support for the original LCG random number generator (#5078)

2024-08-24 10:07:00 -07:00

script.c

Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)

2025-01-08 10:27:00 +00:00

species.c

Evolution Refactor (#6556)

2025-04-23 16:01:33 +02:00

sprite.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

test_runner_args.c

Test moves, items, and abilities in battle

2023-02-01 13:53:57 +00:00

test_runner_battle.c

Master to upcoming merge

2025-05-26 10:41:11 +02:00

test_runner.c

Added check for gBattleStringsTable (#6948)

2025-05-22 21:05:22 +02:00

text.c

Master to upcoming merge

2025-05-26 10:41:11 +02:00