summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-30 18:05:50 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-05-30 18:18:37 -0500
commited3367f9f60bf5e0ae9bf6367b903609b76afbe4 (patch)
tree4fad3ce70394291c746f482a906c22035c879b39 /src/battle
parente3916a561a213a1dfe1d13339c49cd06a1dcbe37 (diff)
Fix some sym_common fake-matching symbols
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/battle_2.c2
-rw-r--r--src/battle/battle_4.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 728a1bdf7..79d60125e 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -3698,7 +3698,7 @@ void sub_8010874(void)
ewram160C9 = 6;
ewram16113 = 0;
for (i = 0; i < 11; i++)
- gBattleResults.unk36[i] = 0;
+ gBattleResults.usedBalls[i] = 0;
gBattleResults.battleTurnCounter = 0;
gBattleResults.playerFaintCounter = 0;
gBattleResults.opponentFaintCounter = 0;
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index bb36c3520..d1435d8ea 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -15770,8 +15770,8 @@ void atkEF_handleballthrow(void)
}
else
{
- if (gBattleResults.unk36[gLastUsedItem - ITEM_ULTRA_BALL] < 0xFF)
- gBattleResults.unk36[gLastUsedItem - ITEM_ULTRA_BALL]++;
+ if (gBattleResults.usedBalls[gLastUsedItem - ITEM_ULTRA_BALL] < 0xFF)
+ gBattleResults.usedBalls[gLastUsedItem - ITEM_ULTRA_BALL]++;
}
}
if (odds > 254) //poke caught