diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-10 16:21:30 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-10 16:21:30 -0500 |
| commit | 6f9ad223a51eab0a2d39296c963486689392d0b5 (patch) | |
| tree | f56f2c86b12699de8655614faada02134e34aa27 /asm | |
| parent | 7d9eef40114229536197afc427212807258e6ebf (diff) | |
stuff
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_tower.s | 4 | ||||
| -rw-r--r-- | asm/pokenav.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index a9d52d597..65fbd0c05 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2163,7 +2163,7 @@ _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 BattleTransition_StartOnField @@ -2200,7 +2200,7 @@ _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 BattleTransition_StartOnField diff --git a/asm/pokenav.s b/asm/pokenav.s index cb6a40450..ea8031cd3 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -22370,7 +22370,7 @@ _080F6C3A: adds r6, r0, r1 ldrh r7, [r6] adds r0, r7, 0 - bl trainer_flag_check + bl HasTrainerAlreadyBeenFought lsls r0, 24 cmp r0, 0 beq _080F6CA0 @@ -22431,7 +22431,7 @@ _080F6CB4: adds r5, r0, r1 ldrh r4, [r5] adds r0, r4, 0 - bl trainer_flag_check + bl HasTrainerAlreadyBeenFought lsls r0, 24 cmp r0, 0 beq _080F6D0E |