diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 14:54:47 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 14:54:47 -0700 |
| commit | cbf2c5c2a9539f74d57f141f233b47923566e838 (patch) | |
| tree | dca65bd5ea75a0e5caacb84c5ce01169c0e259f6 /src/pokemon_item_effect.c | |
| parent | 888109935e9c35d6794c340759e4fd8c8c96760d (diff) | |
Decompile a bunch of battle_9
Diffstat (limited to 'src/pokemon_item_effect.c')
| -rw-r--r-- | src/pokemon_item_effect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c index 3b72ab739..6f1e9dabb 100644 --- a/src/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c @@ -16,10 +16,10 @@ #include "util.h" extern s32 gBattleMoveDamage; -extern u8 gAbsentBankFlags; +extern u8 gAbsentBattlerFlags; extern u8 gBankInMenu; extern u8 gNoOfAllBanks; -extern u16 gBattlePartyID[]; +extern u16 gBattlerPartyIndexes[]; extern u8 gActiveBattler; extern u8 gStringBank; extern struct BattlePokemon gBattleMons[]; @@ -82,7 +82,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo cmdIndex = (GetBankSide(gActiveBattler) != 0); while (cmdIndex < gNoOfAllBanks) { - if (gBattlePartyID[cmdIndex] == partyIndex) + if (gBattlerPartyIndexes[cmdIndex] == partyIndex) { sp34 = cmdIndex; break; @@ -278,14 +278,14 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo { if (sp34 != 4) { - gAbsentBankFlags &= ~gBitTable[sp34]; - CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlePartyID[sp34])); + gAbsentBattlerFlags &= ~gBitTable[sp34]; + CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlerPartyIndexes[sp34])); if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255) gBattleResults.unk4++; } else { - gAbsentBankFlags &= ~gBitTable[gActiveBattler ^ 2]; + gAbsentBattlerFlags &= ~gBitTable[gActiveBattler ^ 2]; if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255) gBattleResults.unk4++; } |