summaryrefslogtreecommitdiff
path: root/mobile/battle_tower_47.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-28 22:17:13 -0500
committerGitHub <noreply@github.com>2017-12-28 22:17:13 -0500
commitb97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch)
tree59b5db70690a9f9041e4964adae1722b4d178a1b /mobile/battle_tower_47.asm
parent82a05a1752b476caab8951fe03f539dcc1a63669 (diff)
parentb9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff)
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'mobile/battle_tower_47.asm')
-rwxr-xr-xmobile/battle_tower_47.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/mobile/battle_tower_47.asm b/mobile/battle_tower_47.asm
index d0ca6edd8..14f69d654 100755
--- a/mobile/battle_tower_47.asm
+++ b/mobile/battle_tower_47.asm
@@ -5,19 +5,19 @@ BattleTowerText:: ; 11c000
; 3: Player won
ld a, [rSVBK]
push af
- ld a, 3 ; BANK(BT_OTTrainerClass)
+ ld a, BANK(BT_OTTrainerClass)
ld [rSVBK], a
-IF DEF(CRYSTAL11)
+if DEF(CRYSTAL11)
ld hl, BT_OTTrainerClass
-ELSE
- ld hl, BT_OTName + 5
+else
; BUG ALERT
; Instead of loading the Trainer Class, this routine
; loads the 6th character in the Trainer's name, then
; uses it to get the gender of the trainer.
; As a consequence, the enemy trainer's dialog will
; always be sampled from the female array.
-ENDC
+ ld hl, BT_OTName + 5
+endc
ld a, [hl]
dec a
ld e, a