Eduardo Quezada 5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
2022-09-02 23:24:08 -04:00
..
2020-10-02 11:17:11 -04:00
2021-11-02 18:34:05 -04:00
2021-03-04 19:32:36 -06:00
2021-11-29 11:19:30 -05:00
2021-07-31 13:28:08 -04:00
2022-08-18 14:23:45 -04:00
2022-07-29 11:15:33 -04:00
2022-07-29 10:52:35 -04:00