Hedara a2ef3284dd Merge branch 'master' into master-to-upcoming
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-10-29 18:42:59 +01:00
..
2025-08-11 08:31:12 +02: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
2025-09-14 20:45:18 +02:00
2025-10-06 19:42:42 +02:00
2025-08-03 14:52:07 +02:00
2025-04-11 11:37:36 +02:00
2025-07-07 10:24:45 -10:00
2024-08-14 13:02:40 +02: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-10-27 16:41:22 +00:00
2024-08-15 23:00:20 +02:00
2025-01-17 19:25:29 -03:00
2025-06-30 09:45:09 -07:00
2025-04-23 16:01:33 +02:00