Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add side labels

This commit is contained in:
DizzyEggg 2017-09-18 12:51:16 +02:00
parent 07c2a83827
commit ecd659f46e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/battle_3.c
View File

@ -1473,11 +1473,11 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
return FALSE; return FALSE;
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{ {
if (GetBankSide(bank) == 0) if (GetBankSide(bank) == SIDE_PLAYER)
party = gPlayerParty; party = gPlayerParty;
else else
party = gEnemyParty; party = gEnemyParty;
r6 = ((bank & 2) >> 1); r6 = ((bank & 2) / 2);
for (i = r6 * 3; i < r6 * 3 + 3; i++) for (i = r6 * 3; i < r6 * 3 + 3; i++)
{ {
if (GetMonData(&party[i], MON_DATA_HP) != 0 if (GetMonData(&party[i], MON_DATA_HP) != 0
@ -1508,13 +1508,13 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
party = gEnemyParty; party = gEnemyParty;
var = bank ^ 1; var = bank ^ 1;
r6 = (var == 0) ? 0 : 1; r6 = (var != 0) ? 1 : 0;
} }
} }
else else
{ {
r7 = sub_806D864(bank); r7 = sub_806D864(bank);
if (GetBankSide(bank) == 0) if (GetBankSide(bank) == SIDE_PLAYER)
party = gPlayerParty; party = gPlayerParty;
else else
party = gEnemyParty; party = gEnemyParty;
@ -1529,7 +1529,7 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
} }
return (i == r6 * 3 + 3); return (i == r6 * 3 + 3);
} }
else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBankSide(bank) == 1) else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBankSide(bank) == SIDE_OPPONENT)
{ {
party = gEnemyParty; party = gEnemyParty;
@ -1548,7 +1548,7 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
} }
else else
{ {
if (GetBankSide(bank) == 1) if (GetBankSide(bank) == SIDE_OPPONENT)
{ {
r7 = GetBankByPlayerAI(1); r7 = GetBankByPlayerAI(1);
r6 = GetBankByPlayerAI(3); r6 = GetBankByPlayerAI(3);
@ -5595,7 +5595,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
u8 ppBonuses; u8 ppBonuses;
u16 move; u16 move;
if (GetBankSide(bank) == 0) if (GetBankSide(bank) == SIDE_PLAYER)
poke = &gPlayerParty[gBattlePartyID[bank]]; poke = &gPlayerParty[gBattlePartyID[bank]];
else else
poke = &gEnemyParty[gBattlePartyID[bank]]; poke = &gEnemyParty[gBattlePartyID[bank]];
@ -6272,7 +6272,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
targetBank = gSideTimers[side].followmeTarget; targetBank = gSideTimers[side].followmeTarget;
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4) else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4)
{ {
if (GetBankSide(gBankAttacker) == 0) if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
{ {
if (Random() & 1) if (Random() & 1)
targetBank = GetBankByPlayerAI(1); targetBank = GetBankByPlayerAI(1);