Cancel persist spells entering arena, fix AE bug

Crossing rooms that both had old style REs with the exact same power and
caster caused issues. Fixed