Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
..
2023-05-10 00:33:43 -04:00
2025-01-15 10:08:02 +01:00
2021-03-29 08:52:40 -04:00
2021-04-01 14:32:23 -04:00
2021-02-03 17:55:37 -05:00
2023-01-14 00:48:58 -05:00
2022-11-09 15:14:18 -05:00
2018-01-19 15:06:49 -05:00
2023-01-14 12:32:54 -05:00
2023-06-01 15:31:12 -04:00
2021-02-26 17:26:39 -05:00
2022-10-12 19:19:42 -04:00
2020-08-02 14:52:05 -04:00
2023-01-14 16:34:14 -05:00
2024-10-04 12:56:21 -04:00
2020-08-29 15:55:28 -04:00