atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated SIDE constant usages

Browse source
This commit is contained in:
LOuroboros 2022-12-15 17:39:27 -03:00
parent 90dd59c039
commit 852f06deea
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle.h
View file

@ -578,7 +578,7 @@ struct BattleStruct
u16 synchronizeMoveEffect; u16 synchronizeMoveEffect;
bool8 anyMonHasTransformed; bool8 anyMonHasTransformed;
void (*savedCallback)(void); void (*savedCallback)(void);
u16 usedHeldItems[PARTY_SIZE][2]; // For each party member and side. For harvest, recycle u16 usedHeldItems[PARTY_SIZE][NUM_BATTLE_SIDES]; // For each party member and side. For harvest, recycle
u16 chosenItem[MAX_BATTLERS_COUNT]; u16 chosenItem[MAX_BATTLERS_COUNT];
u8 AI_itemType[2]; u8 AI_itemType[2];
u8 AI_itemFlags[2]; u8 AI_itemFlags[2];

12
src/battle_main.c
View file

@ -3042,8 +3042,8 @@ static void BattleStartClearSetData(void)
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
gBattleStruct->usedHeldItems[i][0] = 0; gBattleStruct->usedHeldItems[i][B_SIDE_PLAYER] = 0;
gBattleStruct->usedHeldItems[i][1] = 0; gBattleStruct->usedHeldItems[i][B_SIDE_OPPONENT] = 0;
gBattleStruct->itemStolen[i].originalItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); gBattleStruct->itemStolen[i].originalItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
gPartyCriticalHits[i] = 0; gPartyCriticalHits[i] = 0;
} }
@ -4844,10 +4844,10 @@ static void TurnValuesCleanUp(bool8 var0)
gSpecialStatuses[gActiveBattler].parentalBondState = PARENTAL_BOND_OFF; gSpecialStatuses[gActiveBattler].parentalBondState = PARENTAL_BOND_OFF;
} }
gSideStatuses[0] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK); gSideStatuses[B_SIDE_PLAYER] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK);
gSideStatuses[1] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK); gSideStatuses[B_SIDE_OPPONENT] &= ~(SIDE_STATUS_QUICK_GUARD | SIDE_STATUS_WIDE_GUARD | SIDE_STATUS_CRAFTY_SHIELD | SIDE_STATUS_MAT_BLOCK);
gSideTimers[0].followmeTimer = 0; gSideTimers[B_SIDE_PLAYER].followmeTimer = 0;
gSideTimers[1].followmeTimer = 0; gSideTimers[B_SIDE_OPPONENT].followmeTimer = 0;
} }
void SpecialStatusesClear(void) void SpecialStatusesClear(void)