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/item_menu.s | |
| parent | 9260240931d7584a8a2007f0f24a33ba9d82140c (diff) | |
| parent | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (diff) | |
Merge branch 'decompress' into misc
Diffstat (limited to 'asm/item_menu.s')
| -rw-r--r-- | asm/item_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/item_menu.s b/asm/item_menu.s index 9361136ef..001198d95 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -676,20 +676,20 @@ _0810832C: .4byte gSaveBlock2Ptr _08108330: .4byte gUnknown_83D41E4 _08108334: ldr r0, _0810833C @ =gUnknown_83D41EC - bl LoadCompressedObjectPic + bl LoadCompressedSpriteSheet b _08108352 .align 2, 0 _0810833C: .4byte gUnknown_83D41EC _08108340: ldr r0, _08108348 @ =gUnknown_83D41F4 - bl LoadCompressedObjectPalette + bl LoadCompressedSpritePalette b _08108352 .align 2, 0 _08108348: .4byte gUnknown_83D41F4 _0810834C: ldr r0, _08108360 @ =gBagSwapSpriteSheet _0810834E: - bl LoadCompressedObjectPic + bl LoadCompressedSpriteSheet _08108352: ldr r0, _08108364 @ =gUnknown_203AD10 ldr r1, [r0] @@ -702,7 +702,7 @@ _08108360: .4byte gBagSwapSpriteSheet _08108364: .4byte gUnknown_203AD10 _08108368: ldr r0, _08108378 @ =gBagSwapSpritePalette - bl LoadCompressedObjectPalette + bl LoadCompressedSpritePalette ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x10] |