diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:36:47 -0400 |
| commit | 2d141bc612ffecc984f6b4238c2791ba8419a192 (patch) | |
| tree | 04800ef37ba17134a216c3e679a1d0bb046f0bf8 /asm/battle_tower.s | |
| parent | e1f2f7d5daee0fead0b8aed8413977e7cad990eb (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 15cb95854..3f019e1ea 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2082,7 +2082,7 @@ sub_8135534: @ 8135534 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_811AAE8 + bl IsBattleTransitionDone lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |