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

Address review comments, 2

Browse Source
This commit is contained in:
PikalaxALT
2020-04-10 11:11:47 -04:00
parent 61a06dffe7
commit fd66e15464
7 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/link.h
+1 -1
View File
@@ -277,7 +277,7 @@ void ClearLinkCallback_2(void);
void LinkRfu_SetRfuFuncToSend6600(void);
void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
bool8 IsWirelessAdapterConnected(void);
bool8 sub_800A474(u8 blockRequestType);
bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType);
void LinkVSync(void);
bool8 HandleLinkConnection(void);
void PrepareLocalLinkPlayerBlock(void);
include/link_rfu.h
+3 -3
View File
@@ -127,7 +127,7 @@ typedef struct UnkRfuStruct_2
/* 0x010 */ u16 linkman_param[2];
/* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
/* 0x04c */ u8 unk_4c[14];
/* 0x05a */ u8 unk_5a;
/* 0x05a */ u8 cmdA100_blockRequestType;
/* 0x05b */ u8 unk_5b;
/* 0x05c */ u8 unk_5c[5];
/* 0x061 */ u8 unk_61[5];
@@ -139,7 +139,7 @@ typedef struct UnkRfuStruct_2
/* 0x0e4 */ u8 cmd5f00Ack[5];
/* 0x0e9 */ u8 cmd_6600_recvd[5];
/* 0x0ee */ vu8 errorState;
/* 0x0ef */ u8 unk_ef;
/* 0x0ef */ u8 isShuttingDown;
/* 0x0f0 */ u8 linkLossRecoveryState;
/* 0x0f1 */ u8 unk_f1;
/* 0x0f2 */ u16 unk_f2[6];
@@ -207,7 +207,7 @@ u8 GetRfuPlayerCount(void);
void StartSendingKeysToRfu(void);
u8 LinkRfu_GetMultiplayerId(void);
bool32 Rfu_InitBlockSend(const u8 * src, size_t size);
bool8 sub_80FA0F8(u8 a0);
bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType);
u8 Rfu_GetBlockReceivedStatus(void);
void Rfu_SetBlockReceivedFlag(u8 who);
void Rfu_ResetBlockReceivedFlag(u8 who);
src/cable_club.c
+2 -2
View File
@@ -173,7 +173,7 @@ static void sub_80809C4(u8 taskId)
gTasks[taskId].data[0]++;
if (gTasks[taskId].data[0] == 10)
{
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
DestroyTask(taskId);
}
}
@@ -369,7 +369,7 @@ static void Task_LinkupMaster_6(u8 taskId)
sub_800A900(gFieldLinkPlayerCount);
TrainerCard_GenerateCardForLinkPlayer((void*)gBlockSendBuffer);
gTasks[taskId].func = Task_Linkup_6a;
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
}
}
}
src/link.c
+2 -2
View File
@@ -999,11 +999,11 @@ bool8 SendBlock(u8 unused, const void *src, u16 size)
return InitBlockSend(src, size);
}
bool8 sub_800A474(u8 blockRequestType)
bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType)
{
if (gWirelessCommType == 1)
{
return sub_80FA0F8(blockRequestType);
return LinkRfu_PrepareCmd0xA100(blockRequestType);
}
if (gLinkCallback == NULL)
{
src/link_rfu_2.c
+10 -10
View File
@@ -1145,7 +1145,7 @@ static void RfuPrepareSendBuffer(u16 command)
break;
case RFU_COMMAND_0xa100:
if (Cmd8000recvIsFinished())
gSendCmd[1] = Rfu.unk_5a;
gSendCmd[1] = Rfu.cmdA100_blockRequestType;
break;
case RFU_COMMAND_0x7700:
case RFU_COMMAND_0x7800:
@@ -1272,9 +1272,9 @@ static void RfuFunc_SendLastBlock(void)
Rfu.RfuFunc = NULL;
}
bool8 sub_80FA0F8(u8 a0)
bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType)
{
Rfu.unk_5a = a0;
Rfu.cmdA100_blockRequestType = blockRequestType;
RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
return TRUE;
}
@@ -1284,7 +1284,7 @@ static void RfuFunc_End5F00_PowerDownRfu(void)
rfu_clearAllSlot();
rfu_LMAN_powerDownRFU();
gReceivedRemoteLinkPlayers = 0;
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
Rfu.RfuFunc = NULL;
}
@@ -1660,7 +1660,7 @@ static void sub_80FA834(u8 taskId)
{
if (Cmd8000recvIsFinished())
{
Rfu.unk_5a = 0;
Rfu.cmdA100_blockRequestType = 0;
RfuPrepareSendBuffer(RFU_COMMAND_0xa100);
gTasks[taskId].data[0]++;
}
@@ -1879,7 +1879,7 @@ bool32 LinkRfuMain1(void)
bool32 retval = FALSE;
Rfu.parentId = 0;
rfu_LMAN_manager_entity(Random());
if (Rfu.unk_ef == 0)
if (!Rfu.isShuttingDown)
{
switch (Rfu.parent_child)
{
@@ -1900,7 +1900,7 @@ bool32 LinkRfuMain1(void)
bool32 LinkRfuMain2(void)
{
bool32 retval = FALSE;
if (Rfu.unk_ef == 0)
if (!Rfu.isShuttingDown)
{
if (Rfu.parent_child == MODE_PARENT)
retval = sub_80F9204();
@@ -2091,7 +2091,7 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
@@ -2164,7 +2164,7 @@ static void LmanCallback_Child(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
@@ -2341,7 +2341,7 @@ static void LmanCallback_Parent(u8 msg, u8 param_count)
case LMAN_MSG_LMAN_API_ERROR_RETURN:
RfuSetErrorStatus(1, msg);
GetLinkmanErrorParams(msg);
Rfu.unk_ef = 1;
Rfu.isShuttingDown = TRUE;
break;
case LMAN_MSG_REQ_API_ERROR:
case LMAN_MSG_WATCH_DOG_TIMER_ERROR:
src/trade.c
+16 -14
View File
@@ -24,6 +24,8 @@
#include "constants/songs.h"
#include "constants/moves.h"
#define NUM_TRADED_GIFT_RIBBONS 11
struct TradeMenuResources
{
/*0x0000*/ u8 bg2hofs;
@@ -54,7 +56,7 @@ struct TradeMenuResources
/*0x007F*/ u8 filler_7F;
/*0x0080*/ u16 linkData[20];
/*0x00A8*/ u8 loadUiSpritesState;
/*0x00A9*/ u8 giftRibbons[11];
/*0x00A9*/ u8 giftRibbons[NUM_TRADED_GIFT_RIBBONS];
/*0x00B4*/ u8 filler_B4[0x8D0-0xB4];
/*0x08D0*/ struct {
bool8 active;
@@ -1357,7 +1359,7 @@ static bool8 shedinja_maker_maybe(void)
case 3:
if (id == 0)
{
sub_800A474(1);
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
sTradeMenuResourcesPtr->state++;
break;
@@ -1376,71 +1378,71 @@ static bool8 shedinja_maker_maybe(void)
case 7:
if (id == 0)
{
sub_800A474(1);
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
sTradeMenuResourcesPtr->state++;
break;
case 8:
if (GetBlockReceivedStatus() == 3)
{
Trade_Memcpy(&gEnemyParty[2], gBlockRecvBuffer[id ^ 1], 200);
Trade_Memcpy(&gEnemyParty[2], gBlockRecvBuffer[id ^ 1], 2 * sizeof(struct Pokemon));
ResetBlockReceivedFlags();
sTradeMenuResourcesPtr->state++;
}
break;
case 9:
Trade_Memcpy(gBlockSendBuffer, &gPlayerParty[4], 200);
Trade_Memcpy(gBlockSendBuffer, &gPlayerParty[4], 2 * sizeof(struct Pokemon));
sTradeMenuResourcesPtr->state++;
break;
case 11:
if (id == 0)
{
sub_800A474(1);
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
sTradeMenuResourcesPtr->state++;
break;
case 12:
if (GetBlockReceivedStatus() == 3)
{
Trade_Memcpy(&gEnemyParty[4], gBlockRecvBuffer[id ^ 1], 200);
Trade_Memcpy(&gEnemyParty[4], gBlockRecvBuffer[id ^ 1], 2 * sizeof(struct Pokemon));
ResetBlockReceivedFlags();
sTradeMenuResourcesPtr->state++;
}
break;
case 13:
Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, 220);
Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, PARTY_SIZE * sizeof(struct MailStruct) + 4); // why the extra 4 bytes?
sTradeMenuResourcesPtr->state++;
break;
case 15:
if (id == 0)
{
sub_800A474(3);
Link_PrepareCmd0xCCCC_Rfu0xA100(3);
}
sTradeMenuResourcesPtr->state++;
break;
case 16:
if (GetBlockReceivedStatus() == 3)
{
Trade_Memcpy(gLinkPartnerMail, gBlockRecvBuffer[id ^ 1], 216);
Trade_Memcpy(gLinkPartnerMail, gBlockRecvBuffer[id ^ 1], PARTY_SIZE * sizeof(struct MailStruct));
ResetBlockReceivedFlags();
sTradeMenuResourcesPtr->state++;
}
break;
case 17:
Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->giftRibbons, 11);
Trade_Memcpy(gBlockSendBuffer, gSaveBlock1Ptr->giftRibbons, NUM_TRADED_GIFT_RIBBONS);
sTradeMenuResourcesPtr->state++;
break;
case 19:
if (id == 0)
{
sub_800A474(4);
Link_PrepareCmd0xCCCC_Rfu0xA100(4);
}
sTradeMenuResourcesPtr->state++;
break;
case 20:
if (GetBlockReceivedStatus() == 3)
{
Trade_Memcpy(sTradeMenuResourcesPtr->giftRibbons, gBlockRecvBuffer[id ^ 1], 11);
Trade_Memcpy(sTradeMenuResourcesPtr->giftRibbons, gBlockRecvBuffer[id ^ 1], NUM_TRADED_GIFT_RIBBONS);
ResetBlockReceivedFlags();
sTradeMenuResourcesPtr->state++;
}
@@ -2185,7 +2187,7 @@ static void HandleRedrawTradeMenuOnSide(u8 side)
static u8 GetNicknameStringWidthByPartyAndMonIdx(u8 *dest, u8 whichParty, u8 partyIdx)
{
u8 nickname[11];
u8 nickname[POKEMON_NAME_LENGTH];
if (whichParty == 0)
GetMonData(&gPlayerParty[partyIdx], MON_DATA_NICKNAME, nickname);
else
src/union_room.c
+1 -1
View File
@@ -1789,7 +1789,7 @@ static void Task_ExchangeCards(u8 taskId)
{
case 0:
if (GetMultiplayerId() == 0)
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
gTasks[taskId].data[0]++;
break;
case 1: