Umaro's Dash, Relics & Unequipping All

Okay, so I got the Rage Ring & Blizzard Orb to behave like normal relics by NOPping C2/1654 & C2/1664, commands that allow Player Toss & Storm.

Just below that, at C2/1669, there'a a call to "always allow normal attack & charge". If I NOP that, Umaro can't attack and the whole battle glitches right up. Is there possibly a different value then 0x30 that can be used to only allow attack and not charge?

I changed the character checked at C2/1617 from Umaro (0D) to 0E, and the game bypasses all of the Rage Ring, Blizzard Orb, and Charge effects for Umaro. It's amazing sometimes what changing 1 byte can do for you (or against you...)

I still don't know how to include him in the unequip all / unequip not in party / storyline unequip events, though.