Getting Hybrid Classes to Play Nice?

[Radetzky120]

Okay, so I'm developing a hack for FE7 and I've added a really useful hack that replicates Thracia's Mag = Res system. The game works mostly fine, but I'm running into issues with classes that attempt to use both melee and magic weapons (e.g. Troubadours with swords and staves).

Here's an example of my issue in action: https://webmshare.com/Wn1MK

I've used the Melee and Magic Fix that comes with FEditor but that hack doesn't seem to work correctly.