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
..
2024-04-27 19:35:42 +02:00
2025-05-08 16:45:10 -04:00
2022-08-11 12:09:38 -04:00
2023-11-24 16:19:32 +01:00
2024-05-19 10:14:31 +02:00
2023-02-01 11:48:55 -05:00
2025-04-11 11:37:36 +02:00
2025-05-07 16:50:12 +02:00
2025-04-27 14:56:18 +02:00
2023-01-18 11:54:06 -05:00
2024-09-29 13:33:20 -04:00
2024-04-06 15:05:15 -03:00
2022-11-22 02:17:03 -05:00
2023-12-20 12:38:28 +01:00
2025-04-23 16:01:33 +02:00
2024-08-15 23:00:20 +02:00
2025-01-17 19:25:29 -03:00
2025-04-23 16:01:33 +02:00
2024-10-04 12:56:21 -04:00