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/trade.s | |
| parent | 9260240931d7584a8a2007f0f24a33ba9d82140c (diff) | |
| parent | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (diff) | |
Merge branch 'decompress' into misc
Diffstat (limited to 'asm/trade.s')
| -rw-r--r-- | asm/trade.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/trade.s b/asm/trade.s index b4bfcd30f..3e8dc9fc1 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7292,7 +7292,7 @@ _08050040: ldr r1, [r1, 0x8] adds r2, r5, 0 adds r3, r7, 0 - bl sub_800ECC4 + bl HandleLoadSpecialPokePic movs r4, 0 b _0805009A .align 2, 0 @@ -7316,7 +7316,7 @@ _0805007C: _0805009A: mov r0, r8 bl GetMonSpritePalStruct - bl LoadCompressedObjectPalette + bl LoadCompressedSpritePalette ldr r0, _080500C4 @ =gUnknown_2031DAC ldr r1, [r0] adds r0, r1, 0 @@ -10813,7 +10813,7 @@ _08052042: ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] - bl sub_800ECC4 + bl HandleLoadSpecialPokePic ldr r1, [r7] b _080522AC .align 2, 0 @@ -13038,7 +13038,7 @@ _0805349E: ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] - bl sub_800ECC4 + bl HandleLoadSpecialPokePic ldr r1, [r7] b _08053708 .align 2, 0 |