diff options
| -rw-r--r-- | asm/trade.s | 43 | ||||
| -rw-r--r-- | src/trade.c | 10 |
2 files changed, 10 insertions, 43 deletions
diff --git a/asm/trade.s b/asm/trade.s index e33814899..0694e3b0a 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,49 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start sub_8049804 -sub_8049804: @ 8049804 - push {lr} - bl HandleDestroyMenuCursors - bl sub_804A80C - ldr r3, _08049850 @ =gUnknown_03004824 - ldr r0, [r3] - adds r0, 0x7B - movs r1, 0 - strb r1, [r0] - ldr r2, _08049854 @ =gSprites - ldr r0, [r3] - adds r0, 0x40 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldr r0, _08049858 @ =gUnknown_0820C14C - ldr r0, [r0, 0x4] - ldr r1, [r3] - adds r1, 0x7E - ldrh r1, [r1] - lsls r1, 5 - ldr r2, _0804985C @ =0x06010000 - adds r1, r2 - movs r2, 0x14 - bl sub_804ACD8 - pop {r0} - bx r0 - .align 2, 0 -_08049850: .4byte gUnknown_03004824 -_08049854: .4byte gSprites -_08049858: .4byte gUnknown_0820C14C -_0804985C: .4byte 0x06010000 - thumb_func_end sub_8049804 - thumb_func_start sub_8049860 sub_8049860: @ 8049860 push {r4,lr} diff --git a/src/trade.c b/src/trade.c index a96a68f66..faa931e37 100644 --- a/src/trade.c +++ b/src/trade.c @@ -146,6 +146,7 @@ static void sub_8048AB4(void); /*static*/ u8 sub_804AA00(void); /*static*/ void sub_8049E9C(u8); /*static*/ void sub_804AADC(u8, u8); +/*static*/ void sub_804A80C(void); extern u8 gUnknown_020297D8[2]; extern u8 *gUnknown_020296CC[13]; @@ -1708,6 +1709,15 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction) } } +/*static*/ void sub_8049804(void) +{ + HandleDestroyMenuCursors(); + sub_804A80C(); + gUnknown_03004824->unk_007b = 0; + gSprites[gUnknown_03004824->unk_0040].invisible = FALSE; + sub_804ACD8(gUnknown_0820C14C[1], (u8 *)(BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e), 20); +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |