diff options
| author | JimB16 <f1@jimb.de> | 2015-09-01 06:26:31 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-09-01 06:26:31 +0200 |
| commit | d6a4dada406f8ee010f08a16d24907bde50e1d6c (patch) | |
| tree | 466a30fa926de3d84bf01e890b12dd234e14c59a /maps | |
| parent | bcc11712a578f1a0020fb0ab4543205324ec018d (diff) | |
added/renamed constants and labels
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 4 | ||||
| -rw-r--r-- | maps/BattleTowerHallway.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index bda8bf906..ab40bd1be 100644 --- 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 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 9da7ccf3f..4c46d5857 100644 --- 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 |