added/renamed constants and labels

2015-09-01 06:26:31 +02:00
parent bcc11712a5
commit d6a4dada40
6 changed files with 65 additions and 43 deletions
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -34,8 +34,8 @@ Script_BattleRoomLoop: ; 0x9f425
 	special FadeBlackBGMap
 	reloadmap
 	if_not_equal $0, UnknownScript_0x9f4c2
-	copybytetovar wcf64
-	if_equal $7, Script_BeatenAllTrainers
+	copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
+	if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
 	applymovement $2, MovementData_0x9e597
 	warpsound
 	disappear $2
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -27,7 +27,7 @@ Function_0x9f5cb:

 	ld a, 3
 	ld [rSVBK], a
-	ld a, [w3_d800]
+	ld a, [wBTChoiceOfLvlGroup]
 	ld [ScriptVar], a

 	pop af