diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-10-22 20:13:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-10-22 20:13:31 -0400 |
| commit | 0dd3db7061165f990f386546304d4d90331d6cd0 (patch) | |
| tree | f815f3298be4a62a30903930bc5b29ad4f1cf15e /asm | |
| parent | 9fc2c99d18c08043c0349a0d17ba71a8bfb8688b (diff) | |
Rename some functions and all RAM objects in decoration.c
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/trader.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/trader.s b/asm/trader.s index 8e4bce384..8e0b17905 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -433,15 +433,15 @@ sub_8133DA0: @ 8133DA0 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - bl sub_81279C4 + bl IsSelectedDecorInThePC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08133DFC ldr r5, =gSpecialVar_0x8006 - ldr r0, =gUnknown_0203A172 + ldr r0, =gCurDecorationIndex ldrb r1, [r0] - ldr r0, =gUnknown_0203A14C + ldr r0, =gCurDecorInventoryItems ldr r0, [r0] adds r0, r1 ldrb r0, [r0] |