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
..
ability	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
ai	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
form_change
gimmick	New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)	2025-05-15 09:40:02 +02:00
hold_effect	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
item_effect
move_animations
move_effect	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
move_effect_secondary	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
move_effects_combined	Added weather accuracy move flags (#6857)	2025-05-16 07:58:40 +02:00
move_flags	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
starting_status
status1	Remove non-volatile status EFFECTs (#6772)	2025-05-16 22:52:51 +02:00
status2
weather	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
battle_message.c
crit_chance.c
damage_formula.c
end_turn_effects.c
exp.c
move.c
sleep_clause.c	Remove non-volatile status EFFECTs (#6772)	2025-05-16 22:52:51 +02:00
spread_moves.c
switch_in_abilities.c	Create missing ability and move effect test files (#6845)	2025-05-16 12:20:44 +02:00
test_runner_features.c
trainer_control.c	Expand trainerproc to support additional battle types (#6770)	2025-05-17 15:08:44 +02:00
trainer_control.h	Expand trainerproc to support additional battle types (#6770)	2025-05-17 15:08:44 +02:00
trainer_control.party	Expand trainerproc to support additional battle types (#6770)	2025-05-17 15:08:44 +02:00
trainer_slides.c
trainer_slides.h