diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
| commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
| tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /asm/pokemon_summary_screen.s | |
| parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
resolve merge conflicts
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rw-r--r-- | asm/pokemon_summary_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 3b41afb55..c7f2ad085 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -4686,7 +4686,7 @@ sub_81C6648: @ 81C6648 .pool _081C667C: ldrh r0, [r5] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 cmp r0, 0 bne _081C66A0 @@ -4799,7 +4799,7 @@ sub_81C674C: @ 81C674C .pool _081C677C: ldrh r0, [r5] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 cmp r0, 0 bne _081C6790 |