diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
| commit | 6e570a107f6425068902e4ad077ab8c7b6e15ed3 (patch) | |
| tree | 1c6063b3578146df4807ca336dd9802a6f27b771 /asm/pokemon_storage_system.s | |
| parent | 9260240931d7584a8a2007f0f24a33ba9d82140c (diff) | |
| parent | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (diff) | |
Merge branch 'decompress' into misc
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rw-r--r-- | asm/pokemon_storage_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8be5b791f..0c9536a8e 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -7233,7 +7233,7 @@ sub_808F3F8: @ 808F3F8 adds r0, r1 ldr r5, _0808F474 @ =0x000022bc adds r1, r4, r5 - bl sub_800ECC4 + bl HandleLoadSpecialPokePic ldr r1, [r6] ldr r2, _0808F478 @ =0x00000cd8 adds r0, r1, r2 @@ -20609,7 +20609,7 @@ _08095B9C: orrs r0, r1 str r0, [r2, 0x4] mov r0, r9 - bl LoadCompressedObjectPic + bl LoadCompressedSpriteSheet mov r4, r9 ldrh r0, [r4, 0x6] bl GetSpriteTileStartByTag |