diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
| commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
| tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /asm/pokemon_summary_screen.s | |
| parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
I hope this fixes the conflicts
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rw-r--r-- | asm/pokemon_summary_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index a04939c12..a94d69b96 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5756,7 +5756,7 @@ sub_81C6F90: @ 81C6F90 adds r0, r4, 0 adds r1, r4, 0 adds r2, r6, 0 - bl AddItemIconObject + bl AddItemIconSprite lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 |