diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:07:42 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:07:42 -0400 |
| commit | da429471ec7dead013e49c340ed4932b5a85bc44 (patch) | |
| tree | e125ef0500553fb0c25502b72a87767113516ef3 | |
| parent | 2903c9cc17c42b53a05bf9d5642bbc33bf2de5e8 (diff) | |
sub_8049C8C
| -rw-r--r-- | asm/trade.s | 29 | ||||
| -rw-r--r-- | src/trade.c | 10 |
2 files changed, 10 insertions, 29 deletions
diff --git a/asm/trade.s b/asm/trade.s index 85043bfab..db8eeed1b 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,35 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start sub_8049C8C -sub_8049C8C: @ 8049C8C - push {r4,lr} - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _08049CAE - ldr r4, _08049CC0 @ =gUnknown_03004824 - ldr r0, [r4] - adds r0, 0x41 - ldrb r0, [r0] - bl sub_8049E9C - ldr r0, [r4] - adds r0, 0x8A - ldrb r0, [r0] - bl sub_8049E9C -_08049CAE: - ldr r0, _08049CC0 @ =gUnknown_03004824 - ldr r0, [r0] - adds r0, 0x7B - movs r1, 0x7 - strb r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08049CC0: .4byte gUnknown_03004824 - thumb_func_end sub_8049C8C - thumb_func_start sub_8049CC4 sub_8049CC4: @ 8049CC4 push {r4,lr} diff --git a/src/trade.c b/src/trade.c index 5cddaf12f..d04662a93 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1901,6 +1901,16 @@ static void sub_8049A20(void) } } +void sub_8049C8C(void) +{ + if (GetMultiplayerId() == 0) + { + sub_8049E9C(gUnknown_03004824->tradeMenuCursorPosition); + sub_8049E9C(gUnknown_03004824->unk_008a); + } + gUnknown_03004824->unk_007b = 7; +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |