diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
| commit | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (patch) | |
| tree | 5ee0dc775f6a4b6dda46baa8852ef78dd464528e /asm/decompress.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'asm/decompress.s')
| -rw-r--r-- | asm/decompress.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/decompress.s b/asm/decompress.s index 9cff25817..8c213a8d1 100644 --- a/asm/decompress.s +++ b/asm/decompress.s @@ -27,7 +27,7 @@ LoadCompressedObjectPic: @ 800EBCC sub sp, 0x8 adds r4, r0, 0 ldr r0, [r4] - ldr r5, _0800EBFC @ =gUnknown_201C000 + ldr r5, _0800EBFC @ =gDecompressionBuffer adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -45,7 +45,7 @@ LoadCompressedObjectPic: @ 800EBCC pop {r1} bx r1 .align 2, 0 -_0800EBFC: .4byte gUnknown_201C000 +_0800EBFC: .4byte gDecompressionBuffer thumb_func_end LoadCompressedObjectPic thumb_func_start LoadCompressedObjectPicOverrideBuffer @@ -76,7 +76,7 @@ LoadCompressedObjectPalette: @ 800EC28 sub sp, 0x8 adds r5, r0, 0 ldr r0, [r5] - ldr r4, _0800EC54 @ =gUnknown_201C000 + ldr r4, _0800EC54 @ =gDecompressionBuffer adds r1, r4, 0 bl LZ77UnCompWram str r4, [sp] @@ -93,7 +93,7 @@ LoadCompressedObjectPalette: @ 800EC28 pop {r0} bx r0 .align 2, 0 -_0800EC54: .4byte gUnknown_201C000 +_0800EC54: .4byte gDecompressionBuffer _0800EC58: .4byte 0xffff0000 thumb_func_end LoadCompressedObjectPalette |