summaryrefslogtreecommitdiff
path: root/src/pokemon_3.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 10:55:04 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-06 10:55:04 -0700
commit888109935e9c35d6794c340759e4fd8c8c96760d (patch)
treeeb1bd6a4749b5149e19355a9001b8bedaeb8738d /src/pokemon_3.c
parented5847cb41c48357d83b92823e08393a1ca54bdd (diff)
Start decompiling battle_9
Diffstat (limited to 'src/pokemon_3.c')
-rw-r--r--src/pokemon_3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 9346031a6..81a588e8e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -28,7 +28,7 @@
extern u8 gPlayerPartyCount;
extern u8 gEnemyPartyCount;
extern struct BattlePokemon gBattleMons[4];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
extern struct BattleEnigmaBerry gEnigmaBerries[];
extern u16 gSpeciesToHoennPokedexNum[];
extern u16 gSpeciesToNationalPokedexNum[];
@@ -95,7 +95,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
if (itemId == ITEM_ENIGMA_BERRY)
{
- temp = gEnigmaBerries[gActiveBank].itemEffect;
+ temp = gEnigmaBerries[gActiveBattler].itemEffect;
}
itemEffect = temp;