diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-30 19:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 19:39:07 -0400 |
| commit | 1a34a06758175b4d39ee0a81c3441ac958d005fd (patch) | |
| tree | 6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /asm/battle_tower.s | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
| parent | d4ace1162fd85d0531da5bf2296102bf1f503073 (diff) | |
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
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 13a75573a..ee6856130 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2025,7 +2025,7 @@ sub_80E68C4: @ 80E68C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_80D08F8 + bl BT_IsDone lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2114,7 +2114,7 @@ _080E6970: bl sub_8080060 lsls r0, 24 lsrs r0, 24 - bl sub_80D08B8 + bl BT_StartOnField b _080E69E6 .align 2, 0 _080E698C: .4byte gSaveBlock1Ptr @@ -2154,7 +2154,7 @@ _080E69A0: bl sub_8080060 lsls r0, 24 lsrs r0, 24 - bl sub_80D08B8 + bl BT_StartOnField _080E69E6: add sp, 0x4 pop {r4-r6} |