Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
# Conflicts: # test/battle/move_flags/three_strikes.c # test/move_flag_strike_count.c # test/move_flag_three_strikes.c # test/powder_moves.c # test/status1.c