revert fallback
This commit is contained in:
parent
d767211c4a
commit
abfabb9699
@ -2792,9 +2792,18 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data)
|
||||
break;
|
||||
case MON_DATA_TERA_TYPE:
|
||||
if (gSpeciesInfo[substruct0->species].forceTeraType)
|
||||
{
|
||||
retVal = gSpeciesInfo[substruct0->species].forceTeraType;
|
||||
}
|
||||
else if (substruct0->teraType == TYPE_NONE) // Tera Type hasn't been modified so we can just use the personality
|
||||
{
|
||||
const u8 *types = gSpeciesInfo[substruct0->species].types;
|
||||
retVal = (boxMon->personality & 0x1) == 0 ? types[0] : types[1];
|
||||
}
|
||||
else
|
||||
{
|
||||
retVal = substruct0->teraType;
|
||||
}
|
||||
break;
|
||||
case MON_DATA_EVOLUTION_TRACKER:
|
||||
evoTracker.asField.a = substruct1->evolutionTracker1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user