Closed ExpoSeed closed 4 years ago
This one needs some extra review because it was a far messier merge
The main headache of this merge were that some functions were relocated from battle_main.c to battle_util.c for the sake of matching
battle_main.c
battle_util.c
Delay on merging this, the binary post-merge and pre-merge differs, indicating I did not fix conflicts properly.
Not a binary match, but now I'm more confident in this merge. Binary match might be too strict.
This one needs some extra review because it was a far messier merge
The main headache of this merge were that some functions were relocated from
battle_main.c
tobattle_util.c
for the sake of matching