Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synchronoise third type support

Browse Source
This commit is contained in:
DizzyEggg 2019-03-08 10:30:23 +01:00
parent c329252ce3
commit 34cbb26e5e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle_util.c
View File

@ -5885,12 +5885,22 @@ void UndoMegaEvolution(u8 monId)
bool32 DoBattlersShareType(u32 battler1, u32 battler2) bool32 DoBattlersShareType(u32 battler1, u32 battler2)
{ {
if (gBattleMons[battler1].type1 == gBattleMons[battler2].type1 || gBattleMons[battler1].type1 == gBattleMons[battler2].type2) s32 i;
return TRUE; u8 types1[3] = {gBattleMons[battler1].type1, gBattleMons[battler1].type2, gBattleMons[battler1].type3};
else if (gBattleMons[battler1].type2 == gBattleMons[battler2].type1 || gBattleMons[battler1].type2 == gBattleMons[battler2].type2) u8 types2[3] = {gBattleMons[battler2].type1, gBattleMons[battler2].type2, gBattleMons[battler2].type3};
return TRUE;
else if (types1[2] == TYPE_MYSTERY)
return FALSE; types1[2] = types1[0];
if (types2[2] == TYPE_MYSTERY)
types2[2] = types2[0];
for (i = 0; i < 3; i++)
{
if (types1[i] == types2[0] || types1[i] == types2[1] || types1[i] == types2[2])
return TRUE;
}
return FALSE;
} }
bool32 CanBattlerGetOrLoseItem(u8 battlerId, u16 itemId) bool32 CanBattlerGetOrLoseItem(u8 battlerId, u16 itemId)