diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
| commit | 3ddda066d91cbbd377584acacaea62a9deba8873 (patch) | |
| tree | 4af711b5daff8a50548f1df28f3981024cb9be8e /asm/mail_data.s | |
| parent | 3ff48ec8c890d95c5fbc467896414a018bf523ad (diff) | |
import names from pokeruby
Diffstat (limited to 'asm/mail_data.s')
| -rw-r--r-- | asm/mail_data.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/mail_data.s b/asm/mail_data.s index a1fdc62a9..191120b57 100644 --- a/asm/mail_data.s +++ b/asm/mail_data.s @@ -276,7 +276,7 @@ _08097E36: bl GetBoxMonData adds r1, r0, 0 adds r0, r4, 0 - bl sub_8097F00 + bl SpeciesToMailSpecies ldr r1, _08097EC0 @ =gUnknown_3005008 ldr r3, [r1] mov r4, r9 @@ -338,8 +338,8 @@ _08097EEE: bx r1 thumb_func_end sub_8097D38 - thumb_func_start sub_8097F00 -sub_8097F00: @ 8097F00 + thumb_func_start SpeciesToMailSpecies +SpeciesToMailSpecies: @ 8097F00 push {lr} lsls r0, 16 lsrs r0, 16 @@ -356,10 +356,10 @@ _08097F18: bx r1 .align 2, 0 _08097F1C: .4byte 0x75300000 - thumb_func_end sub_8097F00 + thumb_func_end SpeciesToMailSpecies - thumb_func_start sub_8097F20 -sub_8097F20: @ 8097F20 + thumb_func_start MailSpeciesToSpecies +MailSpeciesToSpecies: @ 8097F20 push {lr} lsls r0, 16 lsrs r3, r0, 16 @@ -379,7 +379,7 @@ _08097F3C: _08097F3E: pop {r1} bx r1 - thumb_func_end sub_8097F20 + thumb_func_end MailSpeciesToSpecies thumb_func_start GiveMailToMon2 GiveMailToMon2: @ 8097F44 |