Converted most battle preproc ifs to regular ifs

[AsparagusEduardo]

Description

By suggestion of @SBird1337 and @mrgriffin, I converted most preproc #ifs to proper ifs.

This should make it so that:

• It's less likely to write code that doesn't compile.
• Potentially allow these configs to be run by the test system.

Discord contact info

AsparagusEduardo

[mrgriffin]

I think this is correct 🤞 I didn't look too hard at the changes that are (hopefully!) covered by battle tests.

Also there's quite a few examples where I think it made the code much more readable, especially the ones that were like:

-#if ...
-if (...)
+if (... && ...)
 {
   ...
 }
 else
-#endif
 {
   ...
 }