diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-23 22:00:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 22:00:47 -0400 |
| commit | 5b7c34096cff301c4d74bb2e67a7164b66bcc5dd (patch) | |
| tree | 6124fc5f2881ec5d698509101b407a36fdb934cd /asm/mail_data.s | |
| parent | e0a5896de36da0bb83c3983df8b2f47d019a8896 (diff) | |
| parent | 756f2c3a71c8f7e832a9e70a542210f549f4c61b (diff) | |
Merge pull request #74 from jiangzhengwenjz/misc
menu_helpers
Diffstat (limited to 'asm/mail_data.s')
| -rw-r--r-- | asm/mail_data.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mail_data.s b/asm/mail_data.s index 421aaf452..e19c99e59 100644 --- a/asm/mail_data.s +++ b/asm/mail_data.s @@ -89,7 +89,7 @@ MonHasMail: @ 8097D08 bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _08097D30 @@ -605,8 +605,8 @@ _080980E8: bx r1 thumb_func_end sub_809803C - thumb_func_start itemid_is_mail -itemid_is_mail: @ 80980F8 + thumb_func_start ItemIsMail +ItemIsMail: @ 80980F8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -621,6 +621,6 @@ _0809810A: _0809810C: pop {r1} bx r1 - thumb_func_end itemid_is_mail + thumb_func_end ItemIsMail .align 2, 0 @ Don't pad with nop. |