DizzyEggg / pokeemerald

disassembly of Pokémon Emerald
76 stars 80 forks source link

[battle_engine_v2] Sync with pret #503

Closed ExpoSeed closed 4 years ago

ExpoSeed commented 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

ExpoSeed commented 4 years ago

Delay on merging this, the binary post-merge and pre-merge differs, indicating I did not fix conflicts properly.

ExpoSeed commented 4 years ago

Not a binary match, but now I'm more confident in this merge. Binary match might be too strict.