summaryrefslogtreecommitdiff
path: root/battle/ai/items.asm
diff options
context:
space:
mode:
authorJimB16 <f1@jimb.de>2015-09-04 22:30:40 +0200
committerJimB16 <f1@jimb.de>2015-09-04 22:30:40 +0200
commitc76a3c6ecd36d650a1715c0f5520c2336bd27f9c (patch)
tree33d6ca89e8050d6a691a2092b02414441480a75b /battle/ai/items.asm
parentd6a4dada406f8ee010f08a16d24907bde50e1d6c (diff)
changed more labels
Diffstat (limited to 'battle/ai/items.asm')
-rw-r--r--battle/ai/items.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm
index 8898fdff5..46f04bf65 100644
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -21,7 +21,7 @@ AI_SwitchOrTryItem: ; 38000
jr nz, DontSwitch
ld hl, TrainerClassAttributes + 5
- ld a, [wcfc0]
+ ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers
and a
jr nz, .ok
ld a, [TrainerClass]
@@ -157,7 +157,8 @@ CheckSubstatusCantRun: ; 380ff
AI_TryItem: ; 38105
- ld a, [wcfc0]
+ ; items are not allowed in the BattleTower
+ ld a, [InBattleTowerBattle]
and a
ret nz