diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:10:28 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 15:10:28 -0400 |
| commit | 6183bc1e87b42f0996eb38fbfabb91d79a9cc2cb (patch) | |
| tree | a1aba64615a73ea893b63f3d89e79d606fa6df94 | |
| parent | da429471ec7dead013e49c340ed4932b5a85bc44 (diff) | |
sub_8049CC4
| -rw-r--r-- | asm/trade.s | 24 | ||||
| -rw-r--r-- | src/trade.c | 13 |
2 files changed, 11 insertions, 26 deletions
diff --git a/asm/trade.s b/asm/trade.s index db8eeed1b..ec21c27d5 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10,30 +10,6 @@ .set sub_804A96C_alt, sub_804A96C .endif - thumb_func_start sub_8049CC4 -sub_8049CC4: @ 8049CC4 - push {r4,lr} - ldr r4, _08049CE8 @ =gUnknown_03004824 - ldr r0, [r4] - adds r0, 0x80 - ldrh r1, [r0] - ldr r0, _08049CEC @ =0x00000505 - cmp r1, r0 - bne _08049CE0 - bl sub_8049088 - ldr r0, [r4] - adds r0, 0x7B - movs r1, 0xE - strb r1, [r0] -_08049CE0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08049CE8: .4byte gUnknown_03004824 -_08049CEC: .4byte 0x00000505 - thumb_func_end sub_8049CC4 - thumb_func_start DisplayMessageAndContinueTask DisplayMessageAndContinueTask: @ 8049CF0 push {r4,lr} diff --git a/src/trade.c b/src/trade.c index d04662a93..036f0b4f4 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1437,7 +1437,7 @@ static bool8 sub_8048D44(void) return FALSE; } -/*static*/ void sub_8049088(void) +static void sub_8049088(void) { u8 string[28]; StringCopy(string, gTradeText_TradeOkayPrompt); @@ -1901,7 +1901,7 @@ static void sub_8049A20(void) } } -void sub_8049C8C(void) +/*static*/ void sub_8049C8C(void) { if (GetMultiplayerId() == 0) { @@ -1911,6 +1911,15 @@ void sub_8049C8C(void) gUnknown_03004824->unk_007b = 7; } +/*static*/ void sub_8049CC4(void) +{ + if (gUnknown_03004824->unk_0080 == 5 && gUnknown_03004824->unk_0081 == 5) + { + sub_8049088(); + gUnknown_03004824->unk_007b = 14; + } +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |