diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-09 15:51:13 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-09 15:51:13 +0100 |
| commit | 1ba17e16668c54d4ebfff91801768267e5ce1d10 (patch) | |
| tree | 88669548588ed70fe40dac73e4e204665a675991 /asm/battle_tower.s | |
| parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) | |
| parent | 6454740587f9a97105c45d54bf4284015a20d6d1 (diff) | |
Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index f24069307..2312b63bd 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2544,7 +2544,7 @@ _08163718: adds r0, r6, r2 adds r2, r3, 0 str r3, [sp, 0x1C] - bl sub_81A7024 + bl SetMonMoveAvoidReturn ldr r3, [sp, 0x1C] adds r0, r3, 0x1 lsls r0, 24 @@ -2662,7 +2662,7 @@ _08163818: ldr r2, =gEnemyParty adds r0, r6, r2 adds r2, r7, 0 - bl sub_81A7024 + bl SetMonMoveAvoidReturn ldr r1, =gFacilityTrainerMons ldr r0, [r1] adds r0, r5, r0 |