dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync link_rfu_2 symbols from Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-06-01 15:55:14 -04:00
parent 5d9e161ae1
commit 6580ac8739
10 changed files with 717 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/link.h
+5 -3
View File
@@ -65,7 +65,7 @@
#define LINKCMD_SEND_HELD_KEYS_2 0xCAFE
#define LINKCMD_0xCCCC 0xCCCC
#define LINKTYPE_0x1111 0x1111 // trade
#define LINKTYPE_TRADE 0x1111 // trade
#define LINKTYPE_0x1122 0x1122 // trade
#define LINKTYPE_0x1133 0x1133 // trade
#define LINKTYPE_0x1144 0x1144 // trade
@@ -85,6 +85,8 @@
#define MASTER_HANDSHAKE 0x8FFF
#define SLAVE_HANDSHAKE 0xB9A0
#define IsSendCmdComplete() (gSendCmd[0] == 0)
enum
{
LINK_STATE_START0,
@@ -280,9 +282,9 @@ bool8 IsWirelessAdapterConnected(void);
bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType);
void LinkVSync(void);
bool8 HandleLinkConnection(void);
void PrepareLocalLinkPlayerBlock(void);
void LocalLinkPlayerToBlock(void);
void LinkPlayerFromBlock(u32 who);
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 isConnectionError);
u8 sub_800A8D4(void);
void sub_800AA24(void);
void sub_800A900(u8 a0);
include/link_rfu.h
+100 -80
View File
@@ -3,19 +3,53 @@
#include "global.h"
#include "librfu.h"
#include "link.h"
#include "AgbRfu_LinkManager.h"
#define RFUCMD_SEND_PACKET 0x2F00
#define RFUCMD_READY_CLOSE_LINK 0x5f00
#define RFUCMD_READY_EXIT_STANDBY 0x6600
#define RFUCMD_0x7700 0x7700
#define RFUCMD_0x7800 0x7800
#define RFUCMD_0x8800 0x8800
#define RFUCMD_0x8900 0x8900
#define RFUCMD_PLAYERS_LIST 0x7700
#define RFUCMD_PLAYERS_LIST_2 0x7800
#define RFUCMD_SEND_BLOCK_INIT 0x8800
#define RFUCMD_SEND_BLOCK_STEP 0x8900
#define RFUCMD_SEND_BLOCK_REQ 0xa100
#define RFUCMD_SEND_HELD_KEYS 0xbe00
#define RFUCMD_0xED00 0xed00
#define RFUCMD_0xEE00 0xee00
#define RFUCMD_PARENT_DISCONNECT 0xed00
#define RFUCMD_CHILD_DISCONNECT 0xee00
#define RFU_PACKET_SIZE 6
#define RFU_SERIAL_7F7D 0x7F7D
#define RECV_QUEUE_NUM_SLOTS 20
#define RECV_QUEUE_SLOT_LENGTH (14 * MAX_RFU_PLAYERS)
#define SEND_QUEUE_NUM_SLOTS 40
#define SEND_QUEUE_SLOT_LENGTH 14
#define BACKUP_QUEUE_NUM_SLOTS 2
#define BACKUP_QUEUE_SLOT_LENGTH 14
#define RFU_PACKET_SIZE 6
#define RFU_STATUS_OK 0
#define RFU_STATUS_FATAL_ERROR 1
#define RFU_STATUS_CONNECTION_ERROR 2
#define RFU_STATUS_CHILD_SEND_COMPLETE 3
#define RFU_STATUS_NEW_CHILD_DETECTED 4
#define RFU_STATUS_JOIN_GROUP_OK 5
#define RFU_STATUS_JOIN_GROUP_NO 6
#define RFU_STATUS_WAIT_ACK_JOIN_GROUP 7
#define RFU_STATUS_LEAVE_GROUP_NOTICE 8
#define RFU_STATUS_LEAVE_GROUP 9
#define RFU_STATUS_10 10
#define RFU_STATUS_11 11
#define RFU_STATUS_ACK_JOIN_GROUP 12
#define RFU_RECV_IDLE 0
#define RFU_RECV_RECEIVING 1
#define RFU_RECV_FINISHED 2
// RfuTgtData.gname is read as these structs.
struct GFtgtGnameSub
@@ -53,20 +87,6 @@ struct Padded_U8
u8 value;
};
struct UnkLinkRfuStruct_02022B44
{
u8 fill_00[6];
u16 unk_06;
u8 fill_08[6];
vu8 unk_0e;
u8 unk_0f;
u8 fill_10[0x54];
u16 unk_64;
u8 fill_66[0x1d];
u8 unk_83;
u8 fill_84[0x58];
};
struct RfuBlockSend
{
/* 0x00 */ u16 next;
@@ -79,9 +99,9 @@ struct RfuBlockSend
/* 0x12 */ u8 receiving;
};
struct UnkRfuStruct_2_Sub_124
struct RfuRecvQueue
{
/* 0x000 */ u8 slots[20][70];
/* 0x000 */ u8 slots[RECV_QUEUE_NUM_SLOTS][RECV_QUEUE_SLOT_LENGTH];
/* 0x578 */ vu8 recv_slot;
/* 0x579 */ vu8 send_slot;
/* 0x57a */ vu8 count;
@@ -90,16 +110,16 @@ struct UnkRfuStruct_2_Sub_124
struct RfuSendQueue
{
/* 0x000 */ u8 slots[40][14];
/* 0x000 */ u8 slots[SEND_QUEUE_NUM_SLOTS][SEND_QUEUE_SLOT_LENGTH];
/* 0x230 */ vu8 recv_slot;
/* 0x231 */ vu8 send_slot;
/* 0x232 */ vu8 count;
/* 0x233 */ vu8 full;
};
struct UnkRfuStruct_2_Sub_c1c
struct RfuBackupQueue
{
/* 0x00 */ u8 slots[2][14];
/* 0x00 */ u8 slots[BACKUP_QUEUE_NUM_SLOTS][BACKUP_QUEUE_SLOT_LENGTH];
/* 0x1c */ vu8 recv_slot;
/* 0x1d */ vu8 send_slot;
/* 0x1e */ vu8 count;
@@ -125,57 +145,57 @@ typedef struct UnkRfuStruct_2
/* 0x00e */ u8 unk_0e;
/* 0x00f */ u8 unk_0f;
/* 0x010 */ u16 linkman_param[2];
/* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
/* 0x04c */ u8 unk_4c[14];
/* 0x014 */ u8 main_UNI_recvBuffer[RFU_CHILD_MAX][14];
/* 0x04c */ u8 lastCmdBeforeCommInterrupt[14];
/* 0x05a */ u8 cmdA100_blockRequestType;
/* 0x05b */ u8 unk_5b;
/* 0x05c */ u8 unk_5c[5];
/* 0x061 */ u8 unk_61[5];
/* 0x066 */ u8 unk_66;
/* 0x067 */ u8 unk_67;
/* 0x05b */ u8 sendBlockInitDelay;
/* 0x05c */ bool8 blockReceived[MAX_RFU_PLAYERS];
/* 0x061 */ u8 numBlocksReceived[MAX_RFU_PLAYERS];
/* 0x066 */ u8 idleTaskId;
/* 0x067 */ u8 searchTaskId;
/* 0x068 */ u8 filler_68[4];
/* 0x06c */ struct RfuBlockSend cmd_8800_sendbuf;
/* 0x080 */ struct RfuBlockSend cmd_8800_recvbuf[5];
/* 0x0e4 */ u8 cmd5f00Ack[5];
/* 0x0e9 */ u8 cmd_6600_recvd[5];
/* 0x06c */ struct RfuBlockSend sendBlock;
/* 0x080 */ struct RfuBlockSend recvBlock[MAX_RFU_PLAYERS];
/* 0x0e4 */ bool8 readyCloseLink[MAX_RFU_PLAYERS];
/* 0x0e9 */ bool8 readyExitStandby[MAX_RFU_PLAYERS];
/* 0x0ee */ vu8 errorState;
/* 0x0ef */ bool8 isShuttingDown;
/* 0x0f0 */ u8 linkLossRecoveryState;
/* 0x0f1 */ u8 unk_f1;
/* 0x0f2 */ u16 unk_f2[6];
/* 0x0fe */ u16 cmd_6600_timer;
/* 0x100 */ u16 cmd_6600_count;
/* 0x0f1 */ u8 status;
/* 0x0f2 */ u16 packet[RFU_PACKET_SIZE];
/* 0x0fe */ u16 resendExitStandbyTimer;
/* 0x100 */ u16 resendExitStandbyCount;
/* 0x102 */ u8 unk_102;
/* 0x104 */ struct RfuTgtData unk_104;
/* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124;
/* 0x104 */ struct RfuTgtData tgtData;
/* 0x124 */ struct RfuRecvQueue recvQueue;
/* 0x6a0 */ struct RfuSendQueue sendQueue;
/* 0x8d4 */ struct UnkRfuStruct_2_Sub_c1c unk_c1c;
/* 0x8f4 */ vu8 unk_c3c;
/* 0x8d4 */ struct RfuBackupQueue backupQueue;
/* 0x8f4 */ vu8 linkRecovered;
/* 0x8f5 */ u8 reconnectedParentIdx;
/* 0x8f6 */ vu8 child_slot;
/* 0x8f7 */ u8 unk_c3f[70];
/* 0x93d */ u8 unk_c85;
/* 0x93e */ u8 unk_c86;
/* 0x93f */ u8 recvCmds[5][7][2];
/* 0x93d */ u8 sendStatus;
/* 0x93e */ u8 recvStatus;
/* 0x93f */ u8 recvCmds[MAX_RFU_PLAYERS][7][2];
/* 0x985 */ u8 parentId;
/* 0x986 */ u8 unk_cce; // childId
/* 0x986 */ u8 multiplayerId; // childId
/* 0x987 */ u8 unk_ccf;
/* 0x988 */ vu8 unk_cd0;
/* 0x989 */ u8 unk_cd1[RFU_CHILD_MAX];
/* 0x98d */ u8 unk_cd5[RFU_CHILD_MAX];
/* 0x991 */ u8 unk_cd9;
/* 0x988 */ vu8 sem_UNI_SendRecv;
/* 0x989 */ u8 partnerSendStatuses[RFU_CHILD_MAX];
/* 0x98d */ u8 partnerRecvStatuses[RFU_CHILD_MAX];
/* 0x991 */ u8 linkClosing;
/* 0x992 */ u8 unk_cda;
/* 0x993 */ vu8 unk_cdb;
/* 0x994 */ vu8 unk_cdc;
/* 0x993 */ volatile bool8 unk_cdb;
/* 0x994 */ volatile bool8 unk_cdc;
/* 0x995 */ u8 unk_cdd;
/* 0x996 */ u8 linkPlayerIdx[RFU_CHILD_MAX];
/* 0x99a */ u8 bm_PartnerFlags;
/* 0x99b */ u8 bm_DisconnectSlot;
/* 0x99c */ u8 unk_ce4;
/* 0x99d */ u8 unk_ce5;
/* 0x99d */ u8 bmChatLeaderMaybe;
/* 0x99e */ u8 unionRoomChatters;
/* 0x99f */ u8 acceptSlot_flag;
/* 0x9a0 */ bool8 unk_ce8;
/* 0x9a0 */ bool8 foundNewLeaderMaybe;
/* 0x9a1 */ u8 unk_ce9;
/* 0x9a2 */ u8 unk_cea[RFU_CHILD_MAX];
/* 0x9a6 */ u8 unk_cee[RFU_CHILD_MAX];
@@ -190,7 +210,7 @@ void AddTextPrinterToWindow1(const u8 *str);
bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src);
void LinkRfu_FatalError(void);
void MG_DrawCheckerboardPattern(void);
void Rfu_BeginBuildAndSendCommand5F(void);
void Rfu_SetCloseLinkCallback(void);
bool8 IsLinkRfuTaskFinished(void);
void DestroyWirelessStatusIndicatorSprite(void);
void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0);
@@ -199,18 +219,18 @@ void MEvent_CreateTask_Leader(u32 arg0);
void Rfu_SendPacket(void * data);
u8 CreateTask_ListenToWireless(void);
void LinkRfu_DestroyIdleTask(void);
void sub_80F86F4(void);
void InitRFUAPI(void);
void sub_80FB128(bool32 a0);
bool32 IsSendingKeysToRfu(void);
void Rfu_set_zero(void);
void ClearLinkRfuCallback(void);
u8 GetRfuPlayerCount(void);
void StartSendingKeysToRfu(void);
u8 LinkRfu_GetMultiplayerId(void);
bool32 Rfu_InitBlockSend(const u8 * src, size_t size);
bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType);
bool8 Rfu_SendBlockRequest(u8 blockRequestType);
u8 Rfu_GetBlockReceivedStatus(void);
void Rfu_SetBlockReceivedFlag(u8 who);
void Rfu_ResetBlockReceivedFlag(u8 who);
void Rfu_SetBlockReceivedFlag(u8 linkPlayerId);
void Rfu_ResetBlockReceivedFlag(u8 linkPlayerId);
bool8 Rfu_IsMaster(void);
void ResetLinkRfuGFLayer(void);
bool32 LinkRfuMain1(void);
@@ -219,34 +239,34 @@ bool32 IsRfuRecvQueueEmpty(void);
u32 GetRfuRecvQueueLength(void);
void LinkRfu_Shutdown(void);
void LinkRfu_CreateIdleTask(void);
bool8 ToggleLMANlinkRecovery(bool32 a0);
bool8 ToggleLMANlinkRecovery(bool32 enable);
void var_800D_set_xB(void);
struct GFtgtGname *GetHostRFUtgtGname(void);
void UpdateWirelessStatusIndicatorSprite(void);
void InitRFU(void);
bool32 RfuIsErrorStatus1or2(void);
bool32 RfuHasErrored(void);
void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *ptr);
void RFU_queue_40_14_reset(struct RfuSendQueue *ptr);
void RfuRecvQueue_Reset(struct RfuRecvQueue *ptr);
void RfuSendQueue_Reset(struct RfuSendQueue *ptr);
void RfuSetErrorStatus(u8 a0, u16 msg);
u8 RfuGetErrorStatus(void);
void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2);
bool8 RFU_queue_40_14_send(struct RfuSendQueue *q1, u8 *q2);
bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2);
void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2);
bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 * a0, u8 *a1);
void RFU_queue_40_14_recv(struct RfuSendQueue * a0, u8 *a1);
void RfuSetStatus(u8 status, u16 msg);
u8 RfuGetStatus(void);
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *q1, u8 *q2);
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *q1, u8 *q2);
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *q1, u8 *q2);
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *q1, const u8 *q2);
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue * a0, u8 *a1);
void RfuSendQueue_Enqueue(struct RfuSendQueue * a0, u8 *a1);
void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s32 child_sprite_genders);
void UpdateGameData_GroupLockedIn(bool8 started);
bool32 RfuSerialNumberIsValid(u32 a0);
bool8 sub_80FC1B0(void);
bool32 IsRfuSerialNumberValid(u32 serialNo);
bool8 IsRfuRecoveringFromLinkLoss(void);
bool8 LmanAcceptSlotFlagIsNotZero(void);
void LinkRfu_StopManagerAndFinalizeSlots(void);
bool32 sub_80FA5D4(void);
bool32 sub_80FC1CC(void);
bool32 WaitRfuState(bool32 a0);
bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName);
bool32 CheckTrainerHasLeftByIdAndName(u16 trainerId, const u8 *trainerName);
void SendByteToPartnerByIdAndName(u8 a0, u16 a1, const u8 *a2);
u32 WaitSendByteToPartnerByIdAndName(u16 a0, const u8 *a1);
void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 a2);
@@ -254,7 +274,7 @@ void InitializeRfuLinkManager_LinkLeader(u32 availSlots);
void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId);
void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname);
void InitializeRfuLinkManager_JoinGroup(void);
void LinkRfuNIsend8(void);
void SendLeaveGroupNotice(void);
void CreateTask_RfuReconnectWithParent(const u8 *src, u16 trainerId);
void UpdateGameDataWithActivitySpriteGendersFlag(u8 activity, u32 child_sprite_genders, u32 started);
void RecordMixTrainerNames(void);
@@ -271,8 +291,8 @@ void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2);
bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name);
bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool32 GetRfuUnkCE8(void);
void sub_80FA4A8(void);
bool32 RfuHasFoundNewLeader(void);
void Rfu_UnionRoomChat_StopLinkManager(void);
void sub_80FB9D0(void);
void sub_80FB030(u32 a0);
void ClearRecvCommands(void);
src/cable_club.c
+2 -2
View File
@@ -516,7 +516,7 @@ u8 CreateTask_ReestablishLinkInCableClubRoom(void)
gLinkType = LINKTYPE_MULTI_BATTLE;
break;
case USING_TRADE_CENTER:
gLinkType = LINKTYPE_0x1111;
gLinkType = LINKTYPE_TRADE;
break;
case USING_RECORD_CORNER:
gLinkType = LINKTYPE_0x3322;
@@ -859,7 +859,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId)
case 0:
ScriptContext2_Enable();
FadeScreen(FADE_TO_BLACK, 0);
Rfu_set_zero();
ClearLinkRfuCallback();
data[0]++;
break;
case 1:
src/link.c
+9 -9
View File
@@ -226,7 +226,7 @@ bool8 IsWirelessAdapterConnected(void)
return FALSE;
SetWirelessCommType1();
sub_80F86F4();
InitRFUAPI();
sub_80FB128(TRUE);
if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID)
{
@@ -378,7 +378,7 @@ void OpenLink(void)
}
else
{
sub_80F86F4();
InitRFUAPI();
}
gReceivedRemoteLinkPlayers = FALSE;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
@@ -749,7 +749,7 @@ void ClearLinkCallback_2(void)
{
if (gWirelessCommType)
{
Rfu_set_zero();
ClearLinkRfuCallback();
}
else
{
@@ -1003,7 +1003,7 @@ bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType)
{
if (gWirelessCommType == 1)
{
return LinkRfu_PrepareCmd0xA100(blockRequestType);
return Rfu_SendBlockRequest(blockRequestType);
}
if (gLinkCallback == NULL)
{
@@ -1309,7 +1309,7 @@ void Link_StartSend5FFFwithParam(u16 a0)
{
if (gWirelessCommType == 1)
{
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
}
else
{
@@ -1326,7 +1326,7 @@ void SetCloseLinkCallback(void)
{
if (gWirelessCommType == 1)
{
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
}
else
{
@@ -1441,12 +1441,12 @@ static void CheckErrorStatus(void)
}
}
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06)
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 isConnectionError)
{
sLinkErrorBuffer.status = status;
sLinkErrorBuffer.lastSendQueueCount = lastSendQueueCount;
sLinkErrorBuffer.lastRecvQueueCount = lastRecvQueueCount;
sLinkErrorBuffer.unk_06 = unk_06;
sLinkErrorBuffer.unk_06 = isConnectionError;
}
void CB2_LinkError(void)
@@ -1619,7 +1619,7 @@ bool8 HasLinkErrorOccurred(void)
return gLinkErrorOccurred;
}
void PrepareLocalLinkPlayerBlock(void)
void LocalLinkPlayerToBlock(void)
{
struct LinkPlayerBlock * block;
src/link_rfu_2.c
+501 -446
View File
File diff suppressed because it is too large Load Diff
src/link_rfu_3.c
+58 -58
View File
@@ -163,7 +163,7 @@ static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = {
SpriteCallbackDummy
};
void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue)
void RfuRecvQueue_Reset(struct RfuRecvQueue *ptr)
{
s32 i;
s32 j;
@@ -172,16 +172,16 @@ void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue)
{
for (j = 0; j < 70; j++)
{
queue->slots[i][j] = 0;
ptr->slots[i][j] = 0;
}
}
queue->send_slot = 0;
queue->recv_slot = 0;
queue->count = 0;
queue->full = 0;
ptr->send_slot = 0;
ptr->recv_slot = 0;
ptr->count = 0;
ptr->full = 0;
}
void RFU_queue_40_14_reset(struct RfuSendQueue *ptr)
void RfuSendQueue_Reset(struct RfuSendQueue *ptr)
{
s32 i;
s32 j;
@@ -217,20 +217,20 @@ static void RFU_queue_2_256_reset(struct UnkRfuStruct_Sub_Unused *ptr)
ptr->full = 0;
}
void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data)
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *q1, u8 *q2)
{
s32 i;
u16 imeBak;
u8 count;
if (queue->count < 20)
if (q1->count < 20)
{
imeBak = REG_IME;
REG_IME = 0;
count = 0;
for (i = 0; i < 70; i += 14)
{
if (data[i] == 0 && data[i + 1] == 0)
if (q2[i] == 0 && q2[i + 1] == 0)
{
count++;
}
@@ -239,36 +239,36 @@ void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data)
{
for (i = 0; i < 70; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
q1->slots[q1->recv_slot][i] = q2[i];
}
queue->recv_slot++;
queue->recv_slot %= 20;
queue->count++;
q1->recv_slot++;
q1->recv_slot %= 20;
q1->count++;
for (i = 0; i < 70; i++)
{
data[i] = 0;
q2[i] = 0;
}
}
REG_IME = imeBak;
}
else
{
queue->full = 1;
q1->full = 1;
}
}
void RFU_queue_40_14_recv(struct RfuSendQueue *queue, u8 *data)
void RfuSendQueue_Enqueue(struct RfuSendQueue *a0, u8 *a1)
{
s32 i;
u16 imeBak;
if (queue->count < 40)
if (a0->count < 40)
{
imeBak = REG_IME;
REG_IME = 0;
for (i = 0; i < 14; i++)
{
if (data[i] != 0)
if (a1[i] != 0)
{
break;
}
@@ -277,57 +277,57 @@ void RFU_queue_40_14_recv(struct RfuSendQueue *queue, u8 *data)
{
for (i = 0; i < 14; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
a0->slots[a0->recv_slot][i] = a1[i];
}
queue->recv_slot++;
queue->recv_slot %= 40;
queue->count++;
a0->recv_slot++;
a0->recv_slot %= 40;
a0->count++;
for (i = 0; i < 14; i++)
{
data[i] = 0;
a1[i] = 0;
}
}
REG_IME = imeBak;
}
else
{
queue->full = 1;
a0->full = 1;
}
}
bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 *queue, u8 *dest)
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *a0, u8 *a1)
{
u16 imeBak;
s32 i;
imeBak = REG_IME;
REG_IME = 0;
if (queue->recv_slot == queue->send_slot || queue->full)
if (a0->recv_slot == a0->send_slot || a0->full)
{
for (i = 0; i < 70; i++)
{
dest[i] = 0;
a1[i] = 0;
}
REG_IME = imeBak;
return FALSE;
}
for (i = 0; i < 70; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
a1[i] = a0->slots[a0->send_slot][i];
}
queue->send_slot++;
queue->send_slot %= 20;
queue->count--;
a0->send_slot++;
a0->send_slot %= 20;
a0->count--;
REG_IME = imeBak;
return TRUE;
}
bool8 RFU_queue_40_14_send(struct RfuSendQueue *queue, u8 *dest)
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *q1, u8 *q2)
{
s32 i;
u16 imeBak;
if (queue->recv_slot == queue->send_slot || queue->full != 0)
if (q1->recv_slot == q1->send_slot || q1->full != 0)
{
return FALSE;
}
@@ -335,60 +335,60 @@ bool8 RFU_queue_40_14_send(struct RfuSendQueue *queue, u8 *dest)
REG_IME = 0;
for (i = 0; i < 14; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
q2[i] = q1->slots[q1->send_slot][i];
}
queue->send_slot++;
queue->send_slot %= 40;
queue->count--;
q1->send_slot++;
q1->send_slot %= 40;
q1->count--;
REG_IME = imeBak;
return TRUE;
}
void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *queue, const u8 *data)
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *q1, const u8 *q2)
{
s32 i;
if (data[1] == 0)
if (q2[1] == 0)
{
RFU_queue_2_14_send(queue, NULL);
RfuBackupQueue_Dequeue(q1, NULL);
}
else
{
for (i = 0; i < 14; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
q1->slots[q1->recv_slot][i] = q2[i];
}
queue->recv_slot++;
queue->recv_slot %= 2;
if (queue->count < 2)
q1->recv_slot++;
q1->recv_slot %= 2;
if (q1->count < 2)
{
queue->count++;
q1->count++;
}
else
{
queue->send_slot = queue->recv_slot;
q1->send_slot = q1->recv_slot;
}
}
}
bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *queue, u8 *dest)
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *q1, u8 *q2)
{
s32 i;
if (queue->count == 0)
if (q1->count == 0)
{
return FALSE;
}
if (dest != NULL)
if (q2 != NULL)
{
for (i = 0; i < 14; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
q2[i] = q1->slots[q1->send_slot][i];
}
}
queue->send_slot++;
queue->send_slot %= 2;
queue->count--;
q1->send_slot++;
q1->send_slot %= 2;
q1->count--;
return TRUE;
}
@@ -572,7 +572,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
if (lman.parent_child == MODE_PARENT)
{
retVal = TRUE;
if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
{
memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -586,7 +586,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
else
{
retVal = FALSE;
if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo))
if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo))
{
memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -722,7 +722,7 @@ void UpdateWirelessStatusIndicatorSprite(void)
{
signalStrength = GetParentSignalStrength();
}
if (sub_80FC1B0() == TRUE)
if (IsRfuRecoveringFromLinkLoss() == TRUE)
{
sprite->data[0] = 4;
}
@@ -766,7 +766,7 @@ void UpdateWirelessStatusIndicatorSprite(void)
gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
gMain.oamBuffer[125].tileNum = sprite->data[6] + sprite->anims[sprite->data[2]][sprite->data[4]].frame.imageValue;
CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData));
if (RfuGetErrorStatus() == 1)
if (RfuGetStatus() == 1)
{
DestroyWirelessStatusIndicatorSprite();
}
src/mystery_gift_menu.c
+2 -2
View File
@@ -1270,7 +1270,7 @@ void task00_mystery_gift(u8 taskId)
switch (mevent_client_do_exec(&data->curPromptWindowId))
{
case 6: // done
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
data->prevPromptWindowId = data->curPromptWindowId;
data->state = 13;
break;
@@ -1633,7 +1633,7 @@ void task00_mystery_gift(u8 taskId)
}
break;
case 33:
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
StringCopy(gStringVar1, gLinkPlayers[1].name);
data->state = 34;
break;
src/pokemon_jump_2.c
+1 -1
View File
@@ -1882,7 +1882,7 @@ static int sub_81497A8(void)
static bool32 sub_8149804(void)
{
return !Rfu.unk_124.count && !Rfu.sendQueue.count;
return !Rfu.recvQueue.count && !Rfu.sendQueue.count;
}
static int sub_8149834(u8 *arg0)
src/union_room.c
+27 -25
View File
@@ -861,7 +861,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
}
break;
case 11:
switch (UnionRoomHandleYesNo(&data->textState, TrainerIdAndNameStillInPartnersList(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname)))
switch (UnionRoomHandleYesNo(&data->textState, CheckTrainerHasLeftByIdAndName(
ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId),
data->field_0->arr[data->playerCount].gname_uname.uname)))
{
case 0:
LoadWirelessStatusIndicatorSpriteGfx();
@@ -928,7 +930,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
else if (val == 2)
{
// Disconnect
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
data->state = 4;
}
break;
@@ -1027,7 +1029,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
gSpecialVar_Result = 8;
break;
case 26:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
data->state = 29;
}
@@ -1152,7 +1154,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data,
data->state = state1;
break;
case UNION_ROOM_SPAWN_OUT:
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
RedrawListMenu(data->listTaskId);
data->state = state2;
return TRUE;
@@ -1387,7 +1389,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
switch (sPlayerCurrActivity)
{
case ACTIVITY_BATTLE:
@@ -1407,7 +1409,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
}
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
data->state = 12;
@@ -1421,7 +1423,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity);
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetErrorStatus(7, 0);
RfuSetStatus(7, 0);
StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
StringExpandPlaceholders(gStringVar4, gUnknown_8457700);
}
@@ -1432,7 +1434,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
{
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetErrorStatus(12, 0);
RfuSetStatus(12, 0);
data->delayBeforePrint = 0;
}
}
@@ -1443,7 +1445,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
}
if (!RfuGetErrorStatus() && JOY_NEW(B_BUTTON))
if (!RfuGetStatus() && JOY_NEW(B_BUTTON))
data->state = 7;
break;
case 7:
@@ -1451,10 +1453,10 @@ static void Task_TryJoinLinkGroup(u8 taskId)
data->state = 8;
break;
case 8:
switch (UnionRoomHandleYesNo(&data->textState, RfuGetErrorStatus()))
switch (UnionRoomHandleYesNo(&data->textState, RfuGetStatus()))
{
case 0:
LinkRfuNIsend8();
SendLeaveGroupNotice();
data->state = 9;
RedrawListMenu(data->listTaskId);
break;
@@ -1470,7 +1472,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
}
break;
case 9:
if (RfuGetErrorStatus())
if (RfuGetStatus())
data->state = 6;
break;
case 10:
@@ -1494,7 +1496,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
case 13:
DestroyWirelessStatusIndicatorSprite();
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()]))
{
gSpecialVar_Result = 6;
data->state = 23;
@@ -1507,7 +1509,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
case 15:
DestroyWirelessStatusIndicatorSprite();
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()]))
{
gSpecialVar_Result = 8;
data->state = 23;
@@ -2180,7 +2182,7 @@ static void Task_MEvent_Leader(u8 taskId)
}
else if (val == 2)
{
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
data->state = 2;
}
break;
@@ -2228,7 +2230,7 @@ static void Task_MEvent_Leader(u8 taskId)
}
break;
case 15:
if (RfuGetErrorStatus() == 1 || RfuGetErrorStatus() == 2)
if (RfuGetStatus() == 1 || RfuGetStatus() == 2)
{
data->state = 13;
}
@@ -2370,7 +2372,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
data->state = 10;
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
case 2:
@@ -2379,7 +2381,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_84576AC);
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
break;
}
break;
@@ -2396,7 +2398,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
data->state++;
break;
case 9:
if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetErrorStatus()]))
if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetStatus()]))
{
DestroyWirelessStatusIndicatorSprite();
DestroyTask(taskId);
@@ -2535,7 +2537,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
data->state = 12;
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
case 2:
@@ -2544,7 +2546,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_845777C);
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
break;
}
break;
@@ -2837,7 +2839,7 @@ static void Task_RunUnionRoom(u8 taskId)
break;
case 25:
UR_RunTextPrinters_CheckPrinter0Active();
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 4:
HandleCancelTrade(TRUE);
@@ -3032,7 +3034,7 @@ static void Task_RunUnionRoom(u8 taskId)
}
break;
case 21:
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 4:
HandleCancelTrade(TRUE);
@@ -3054,7 +3056,7 @@ static void Task_RunUnionRoom(u8 taskId)
taskData[3]++;
break;
case 22:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
@@ -3073,7 +3075,7 @@ static void Task_RunUnionRoom(u8 taskId)
data->recvActivityRequest[0] = 0;
break;
case 12:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
HandleCancelTrade(FALSE);
data->state = 2;
src/union_room_chat.c
+12 -12
View File
@@ -324,7 +324,7 @@ static void ChatEntryRoutine_Join(void)
sWork->routineState++;
// fall through
case 1:
if (IsLinkTaskFinished() && !GetRfuUnkCE8())
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
if (SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
@@ -527,14 +527,14 @@ static void ChatEntryRoutine_AskQuitChatting(void)
sWork->routineState = 3;
break;
case 0:
sub_80FA4A8();
Rfu_UnionRoomChat_StopLinkManager();
PrepareSendBuffer_Disband(sWork->sendMessageBuffer);
sWork->routineState = 4;
break;
}
break;
case 4:
if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
{
if (sWork->multiplayerId == 0)
sWork->routineState = 6;
@@ -577,15 +577,15 @@ static void ChatEntryRoutine_ExitChat(void)
}
break;
case 3:
if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
break;
case 4:
if ((GetBlockReceivedStatus() & 1) && !GetRfuUnkCE8())
if ((GetBlockReceivedStatus() & 1) && !RfuHasFoundNewLeader())
sWork->routineState++;
break;
case 5:
if (IsLinkTaskFinished() && !GetRfuUnkCE8())
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -620,7 +620,7 @@ static void ChatEntryRoutine_Drop(void)
}
break;
case 1:
if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !GetRfuUnkCE8())
if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -666,7 +666,7 @@ static void ChatEntryRoutine_Disbanded(void)
}
break;
case 2:
if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !GetRfuUnkCE8())
if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -704,7 +704,7 @@ static void ChatEntryRoutine_SendMessage(void)
sWork->routineState++;
// fall through
case 1:
if (IsLinkTaskFinished() == TRUE && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() == TRUE && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
break;
case 2:
@@ -1355,7 +1355,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
}
tBlockReceivedStatus = GetBlockReceivedStatus();
if (!tBlockReceivedStatus && GetRfuUnkCE8())
if (!tBlockReceivedStatus && RfuHasFoundNewLeader())
return;
tI = 0;
@@ -1409,7 +1409,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
// You're the leader, and the person who left is not you
if (GetLinkPlayerCount() == 2)
{
sub_80FA4A8();
Rfu_UnionRoomChat_StopLinkManager();
sWork->exitType = CHATEXIT_LEADER_LAST;
DestroyTask(taskId);
return;
@@ -1433,7 +1433,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
DestroyTask(taskId);
break;
case 2:
if (!GetRfuUnkCE8())
if (!RfuHasFoundNewLeader())
{
if (sWork->multiplayerId == 0)
sub_80FB030(sWork->linkPlayerCount);