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/mevent_server.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'asm/mevent_server.s')
| -rw-r--r-- | asm/mevent_server.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mevent_server.s b/asm/mevent_server.s index 1def33127..5772b19f4 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -820,7 +820,7 @@ _08144E30: .align 2, 0 _08144E48: .4byte gSaveBlock2Ptr _08144E4C: - ldr r0, _08144E68 @ =gUnknown_201C000 + ldr r0, _08144E68 @ =gDecompressionBuffer ldr r1, [r4, 0x18] movs r2, 0x80 lsls r2, 3 @@ -837,7 +837,7 @@ _08144E62: pop {r1} bx r1 .align 2, 0 -_08144E68: .4byte gUnknown_201C000 +_08144E68: .4byte gDecompressionBuffer thumb_func_end sub_8144CA0 thumb_func_start sub_8144E6C @@ -894,7 +894,7 @@ _08144EB4: sub_8144EBC: @ 8144EBC push {r4,lr} adds r4, r0, 0 - ldr r3, _08144EE4 @ =gUnknown_201C000 + ldr r3, _08144EE4 @ =gDecompressionBuffer adds r0, r4, 0x4 ldr r1, _08144EE8 @ =gSaveBlock2Ptr ldr r1, [r1] @@ -913,7 +913,7 @@ _08144EDC: pop {r1} bx r1 .align 2, 0 -_08144EE4: .4byte gUnknown_201C000 +_08144EE4: .4byte gDecompressionBuffer _08144EE8: .4byte gSaveBlock2Ptr _08144EEC: .4byte gSaveBlock1Ptr thumb_func_end sub_8144EBC |