diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
| commit | e24f3808f47d292776f4e7506217f93756dd19bf (patch) | |
| tree | d910619ff23e466bfd4b673381c1642656e3dc5c /asm/battle_setup.s | |
| parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
| parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index fbedfff2f..b345ca96d 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2407,7 +2407,7 @@ _080B1AD8: .pool _080B1AEC: bl sub_80B1C7C - bl box_related_two__2 + bl ShowFieldMessage _080B1AF4: pop {r0} bx r0 @@ -2468,7 +2468,7 @@ _080B1B56: special_trainer_unable_to_battle: @ 80B1B60 push {lr} bl sub_80B1D18 - bl box_related_two__2 + bl ShowFieldMessage pop {r0} bx r0 thumb_func_end special_trainer_unable_to_battle |