diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-04 20:31:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-04 20:31:11 -0400 |
| commit | 5c7bef25af764b3abe71ba421f603b092be6cb52 (patch) | |
| tree | b5fcc1102ed2d79a8ae826c6fe5bef622c109853 | |
| parent | 12c4614cc396830f62c02c65547a3465829be5c8 (diff) | |
sub_804B2B0
| -rw-r--r-- | asm/trade.s | 20 | ||||
| -rw-r--r-- | src/trade.c | 13 |
2 files changed, 10 insertions, 23 deletions
diff --git a/asm/trade.s b/asm/trade.s index ba5cef071..8ebe142e0 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -788,24 +788,4 @@ _0804B29C: bx r0 thumb_func_end sub_804B24C - thumb_func_start sub_804B2B0 -sub_804B2B0: @ 804B2B0 - push {lr} - ldr r0, _0804B2C0 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _0804B2C4 - movs r0, 0 - b _0804B2CC - .align 2, 0 -_0804B2C0: .4byte gReceivedRemoteLinkPlayers -_0804B2C4: - bl GetMultiplayerId - lsls r0, 24 - lsrs r0, 24 -_0804B2CC: - pop {r1} - bx r1 - thumb_func_end sub_804B2B0 - .align 2, 0 @ Don't pad with nop. diff --git a/src/trade.c b/src/trade.c index 2532e6e89..c6933d8a0 100644 --- a/src/trade.c +++ b/src/trade.c @@ -224,7 +224,7 @@ static void sub_804D7AC(struct Sprite *); /*static*/ bool8 sub_804C29C(void); /*static*/ void sub_804DC18(void); /*static*/ void sub_804BB78(void); -/*static*/ bool8 sub_804B2B0(void); +static u8 sub_804B2B0(void); static void sub_804E144(void); static void sub_804E1A0(u8); /*static*/ void sub_804B790(void); @@ -3513,6 +3513,13 @@ void sub_804B228(void); void sub_804B24C(void); +static u8 sub_804B2B0(void) +{ + if (gReceivedRemoteLinkPlayers) + return GetMultiplayerId(); + return 0; +} + void sub_804B2D0(u8 whichParty, u8 a1) { u8 v0; @@ -5050,9 +5057,9 @@ void sub_804DB84(void) void sub_804DC18(void) { - u8 flag = sub_804B2B0(); + u8 mpId = sub_804B2B0(); sub_804D63C(); - if (!flag && gUnknown_03004828->unk_009c == 1 && gUnknown_03004828->unk_009d == 1) + if (mpId == 0 && gUnknown_03004828->unk_009c == 1 && gUnknown_03004828->unk_009d == 1) { gUnknown_03004828->linkData[0] = 0xdcba; Trade_SendData(gUnknown_03004828); |