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
..
2025-05-03 10:26:07 +02:00
2025-05-03 10:26:07 +02:00
2025-05-03 10:26:07 +02:00
2025-01-01 20:34:33 +01:00
2025-03-12 23:41:28 +01:00
2025-01-25 13:28:46 +01:00