I spent the day making sure that both the Classic Battle system and the Shop & Inventory system were as compatible as possible. This means some things are included in each  file that aren't strictly necessary but also meant that the battle system got some better use of enumerators and global values.