- if (battle->GetIkariMenu().SelectedIsEnabled() && battle->GetIkariMenu().Selected()->HasIkari()) {
- const Ikari *ikari(battle->GetIkariMenu().Selected()->GetIkari());
- battle->ActiveHeroTargets().Reset();
+ if (battle->ActiveHero().IkariMenu().SelectedIsEnabled() && battle->ActiveHero().IkariMenu().Selected()->HasIkari()) {
+ AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+ const Ikari *ikari(battle->ActiveHero().IkariMenu().Selected()->GetIkari());
+ ac.Selection().Reset();