diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /asm/battle_tower.s | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 788061f2b..1e07bdb9c 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1353,7 +1353,7 @@ _08162AD0: ldr r0, =0x000003fe cmp r4, r0 bne _08162AE4 - bl sub_81A4CB0 + bl GetFrontierBrainTrainerPicIndex lsls r0, 24 lsrs r0, 24 b _08162BCA @@ -1479,7 +1479,7 @@ _08162C08: ldr r0, =0x000003fe cmp r4, r0 bne _08162C1C - bl sub_81A4D00 + bl GetFrontierBrainTrainerClass lsls r0, 24 lsrs r0, 24 b _08162D1E @@ -1729,7 +1729,7 @@ _08162E54: cmp r5, r0 bne _08162E68 adds r0, r6, 0 - bl sub_81A4D50 + bl CopyFrontierBrainTrainerName b _08162F62 .pool _08162E68: |