diff options
| author | yenatch <yenatch@gmail.com> | 2017-10-08 23:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 23:54:46 -0400 |
| commit | b0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch) | |
| tree | be0dadd4cb3a6c36e27233836a6f104359d49949 /asm/battle_tower.s | |
| parent | b21c159b08c57a948edb268ac9b9b5baf6b4332d (diff) | |
| parent | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff) | |
Merge branch 'master' into scaninc
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 15cb95854..cd8eede60 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1522,7 +1522,7 @@ _081350AE: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl GetNationalPokedexFlag + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _081350C6 @@ -1555,7 +1555,7 @@ AppendBattleTowerBannedSpeciesName: @ 81350E0 lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl GetNationalPokedexFlag + bl GetSetPokedexFlag lsls r0, 24 cmp r0, 0 beq _081351E6 @@ -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 @@ -2163,10 +2163,10 @@ _081355D6: bl CreateTask movs r0, 0 bl current_map_music_set__default_for_battle - bl GetBattleTowerBattleTransition + bl BattleSetup_GetBattleTowerBattleTransition lsls r0, 24 lsrs r0, 24 - bl sub_811AABC + bl BattleTransition_StartOnField b _08135648 .align 2, 0 _081355F4: .4byte gPlayerParty @@ -2200,10 +2200,10 @@ _08135606: bl CreateTask movs r0, 0 bl current_map_music_set__default_for_battle - bl GetBattleTowerBattleTransition + bl BattleSetup_GetBattleTowerBattleTransition lsls r0, 24 lsrs r0, 24 - bl sub_811AABC + bl BattleTransition_StartOnField _08135648: add sp, 0x4 pop {r4,r5} |