changed more labels

2015-09-04 22:30:40 +02:00
parent d6a4dada40
commit c76a3c6ecd
7 changed files with 79 additions and 55 deletions
--- 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