Hedara 1abfa7acfa Merge branch 'master' into master-upcoming ... Conflicts: include/battle.h include/constants/battle_string_ids.h src/battle_ai_util.c src/battle_main.c src/battle_util.c test/battle/ai/ai.c		2025-05-12 18:21:35 +02:00
..
ability	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
ai	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
form_change
gimmick
hold_effect	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
item_effect
move_animations
move_effect	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
move_effect_secondary
move_effects_combined
move_flags
starting_status
status1
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
spread_moves.c
test_runner_features.c
trainer_control.c
trainer_control.h
trainer_control.party
trainer_slides.c
trainer_slides.h