Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
2022-07-15 12:58:46 -04:00
..
2022-07-03 16:28:34 -04:00
2022-05-03 03:38:44 +03:00
2021-02-10 16:26:09 -05:00
2021-04-06 16:55:43 -04:00
2020-07-30 19:37:16 -04:00
2021-11-01 21:59:34 -03:00
2021-02-05 01:27:11 -05:00
2021-04-26 12:35:35 -04:00
2022-02-28 13:34:39 -05:00
2022-05-17 14:00:02 -04:00
2021-03-18 15:18:23 -04:00
2021-08-10 22:13:02 -04:00
2021-11-01 18:36:35 -03:00
2021-02-08 14:45:56 -05:00
2021-05-11 10:16:04 -05:00
2021-12-31 00:16:56 -05:00
2021-10-21 16:54:16 -04:00
2021-11-15 10:57:06 -05:00
2022-01-05 12:18:49 -05:00
2022-05-08 21:23:51 -07:00
2021-01-19 17:59:36 +00:00
2020-07-30 19:37:16 -04:00
2021-02-05 12:08:25 -05:00
2021-11-10 11:59:15 -05:00
2022-01-05 12:18:49 -05:00
2022-03-31 12:54:07 -04:00
2022-06-14 09:37:39 -04:00
2021-10-17 02:09:31 -04:00
2021-12-31 00:16:56 -05:00