diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-22 19:53:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-22 19:53:25 -0500 |
| commit | 5b83924d6ceb4a78f17c84266c18634b08e6f7f4 (patch) | |
| tree | 39dee9241a0ccb04047c832776ecbbca76ee9dbc /asm/trader.s | |
| parent | c042e5148b9fa3a51a4010922c3f9cd6ba11b51e (diff) | |
| parent | 1ef4dbe691af72bec7fbe2d57f094c335f6de3a3 (diff) | |
Merge pull request #95 from PikalaxALT/decoration
Move these palettes to INCBINs
Diffstat (limited to 'asm/trader.s')
| -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] |