Hedara 90aed43c27 Merge branch 'master' into master-upcoming ... Conflicts: .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml .github/ISSUE_TEMPLATE/03_feature_requests.yaml .github/ISSUE_TEMPLATE/04_other_errors.yaml .github/pull_request_template.md src/battle_controller_player.c src/battle_main.c src/battle_script_commands.c src/battle_util.c src/data/graphics/pokemon.h src/data/pokemon/species_info/gen_9_families.h test/battle/ability/flower_veil.c test/battle/ability/sweet_veil.c test/battle/ability/synchronize.c test/battle/ability/water_bubble.c test/battle/move_effect/fell_stinger.c test/battle/move_effect/level_damage.c test/battle/move_effect/magic_room.c test/battle/move_effect/me_first.c test/battle/move_effect/sky_drop.c test/battle/move_effect/smack_down.c test/battle/move_effect/wish.c test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c		2025-05-22 15:41:08 +02:00
..
battle	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +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	Refactor AI flags to u64 (#6753)	2025-05-04 17:16:34 +02:00
test_runner.c	Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)	2025-03-28 21:43:04 +01:00
text.c	Master to upcoming merge	2025-05-15 20:37:27 +02:00