Fix AI Guard Spec use, and Specs->Spec

This commit is contained in:
GriffinR
2021-04-03 15:18:17 -04:00
parent f4d8a91ba4
commit b6711441f5
4 changed files with 16 additions and 7 deletions

View File

@@ -378,10 +378,19 @@ void HandleAction_UseItem(void)
gBattleScripting.animArg2 = 0;
}
break;
case AI_ITEM_GUARD_SPECS:
case AI_ITEM_GUARD_SPEC:
// It seems probable that at some point there was a special message for
// an AI trainer using Guard Spec in a double battle.
// There isn't now however, and the assignment to 2 below goes out of
// bounds for gMistUsedStringIds and instead prints "{mon} is getting pumped"
// from the next table, gFocusEnergyUsedStringIds.
// In any case this isn't an issue in the retail version, as no trainers
// are ever given any Guard Spec to use.
#ifndef UBFIX
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
gBattleCommunication[MULTISTRING_CHOOSER] = 2; // Going OOB for gMistUsedStringIds?
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
else
#endif
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_MIST;
break;
}