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/field_message_box.s | |
| parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
| parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'asm/field_message_box.s')
| -rw-r--r-- | asm/field_message_box.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 35267e8d4..b86b6b738 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -108,8 +108,8 @@ _080981E4: .pool thumb_func_end task_del_textbox - thumb_func_start box_related_two__2 -box_related_two__2: @ 80981EC + thumb_func_start ShowFieldMessage +ShowFieldMessage: @ 80981EC push {r4,lr} adds r1, r0, 0 ldr r4, =gUnknown_020375BC @@ -130,7 +130,7 @@ _0809820E: pop {r4} pop {r1} bx r1 - thumb_func_end box_related_two__2 + thumb_func_end ShowFieldMessage thumb_func_start sub_8098214 sub_8098214: @ 8098214 |