diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
| commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
| tree | 656599caae716c6cc8e81121f2b1cd061927b99e /asm/item_use.s | |
| parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
fix pokeblock conflicts
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index 378ed09f1..ebf5ac979 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -266,7 +266,7 @@ sub_80FD254: @ 80FD254 ldr r1, =bag_menu_mail_related mov r0, sp movs r2, 0 - bl sub_8121478 + bl ReadMail add sp, 0x24 pop {r0} bx r0 |