diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/field_message_box.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/field_message_box.s')
| -rw-r--r-- | asm/field_message_box.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/field_message_box.s b/asm/field_message_box.s index b86b6b738..0c1fae6de 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -181,8 +181,8 @@ _08098272: bx r1 thumb_func_end sub_8098238 - thumb_func_start box_related_two__3 -box_related_two__3: @ 8098278 + thumb_func_start ShowFieldAutoScrollMessage +ShowFieldAutoScrollMessage: @ 8098278 push {lr} adds r1, r0, 0 ldr r2, =gUnknown_020375BC @@ -202,7 +202,7 @@ _08098298: _0809829A: pop {r1} bx r1 - thumb_func_end box_related_two__3 + thumb_func_end ShowFieldAutoScrollMessage thumb_func_start sub_80982A0 sub_80982A0: @ 80982A0 @@ -267,8 +267,8 @@ textbox_auto_and_task_add: @ 8098304 bx r0 thumb_func_end textbox_auto_and_task_add - thumb_func_start textbox_close -textbox_close: @ 8098314 + thumb_func_start HideFieldMessageBox +HideFieldMessageBox: @ 8098314 push {lr} bl task_del_textbox movs r0, 0 @@ -280,7 +280,7 @@ textbox_close: @ 8098314 pop {r0} bx r0 .pool - thumb_func_end textbox_close + thumb_func_end HideFieldMessageBox thumb_func_start textbox_any_visible textbox_any_visible: @ 8098330 @@ -290,8 +290,8 @@ textbox_any_visible: @ 8098330 .pool thumb_func_end textbox_any_visible - thumb_func_start sub_809833C -sub_809833C: @ 809833C + thumb_func_start IsFieldMessageBoxHidden +IsFieldMessageBoxHidden: @ 809833C push {lr} ldr r0, =gUnknown_020375BC ldrb r0, [r0] @@ -305,7 +305,7 @@ _08098350: _08098352: pop {r1} bx r1 - thumb_func_end sub_809833C + thumb_func_end IsFieldMessageBoxHidden thumb_func_start sub_8098358 sub_8098358: @ 8098358 |