diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-27 06:46:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 06:46:29 -0400 |
| commit | c396aaa804543c6950bdef918f3773394da09bdf (patch) | |
| tree | a925bd32e0745ddf3ecef23d1ef3e710f3250273 /src/union_room.c | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/union_room.c b/src/union_room.c index f19eba38d..876e11e19 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -2898,7 +2898,7 @@ static void Task_RunUnionRoom(u8 taskId) if (var5 == -2 || var5 == IN_UNION_ROOM) { data->playerSendBuffer[0] = IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); StringCopy(gStringVar4, gUnknown_845842C[gLinkPlayers[0].gender]); data->state = 32; } @@ -2913,7 +2913,7 @@ static void Task_RunUnionRoom(u8 taskId) else { data->playerSendBuffer[0] = sPlayerCurrActivity | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 27; } } @@ -2942,7 +2942,7 @@ static void Task_RunUnionRoom(u8 taskId) data->playerSendBuffer[0] = ACTIVITY_TRADE | IN_UNION_ROOM; data->playerSendBuffer[1] = sUnionRoomTrade.species; data->playerSendBuffer[2] = sUnionRoomTrade.level; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 29; break; case 29: @@ -3130,32 +3130,32 @@ static void Task_RunUnionRoom(u8 taskId) if (!HasAtLeastTwoMonsOfLevel30OrLower()) { data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 10; StringCopy(gStringVar4, gUnknown_84584C0); } else { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 13; } } else if (sPlayerCurrActivity == (ACTIVITY_CARD | IN_UNION_ROOM)) { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); ViewURoomPartnerTrainerCard(gStringVar4, data, MODE_PARENT); data->state = 40; } else { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 13; } break; case 1: case -1: data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 10; GetYouDeclinedTheOfferMessage(gStringVar4, sPlayerCurrActivity); break; @@ -3418,7 +3418,7 @@ void var_800D_set_xB(void) static void ReceiveUnionRoomActivityPacket(struct UnkStruct_URoom * uroom) { - if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == RFU_COMMAND_0x2f00) + if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == RFUCMD_SEND_PACKET) { uroom->recvActivityRequest[0] = gRecvCmds[1][1]; if (gRecvCmds[1][1] == (ACTIVITY_TRADE | IN_UNION_ROOM)) |