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

Some small fixes

Browse Source
This commit is contained in:
PikalaxALT
2020-02-01 16:46:52 -05:00
parent 9400cd09de
commit 0d60939fd7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/librfu.h
+1 -1
View File
@@ -454,7 +454,7 @@ struct RfuStatic
u8 linkEmergencyFlag[4]; u8 linkEmergencyFlag[4];
u8 lsFixedCount[4]; u8 lsFixedCount[4];
u16 cidBak[4]; u16 cidBak[4];
u16 unk_1a; u16 linkEmergencyLimit;
u16 reqResult; u16 reqResult;
u16 tryPid; u16 tryPid;
u16 watchdogTimer; u16 watchdogTimer;
src/librfu_rfu.c
+7 -7
View File
@@ -409,14 +409,14 @@ void rfu_REQ_configSystem(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer)
STWI_send_SystemConfigREQ((availSlotFlag & AVAIL_SLOT1) | 0x3C, maxMFrame, mcTimer); STWI_send_SystemConfigREQ((availSlotFlag & AVAIL_SLOT1) | 0x3C, maxMFrame, mcTimer);
if (mcTimer == 0) if (mcTimer == 0)
{ {
gRfuStatic->unk_1a = 1; gRfuStatic->linkEmergencyLimit = 1;
} }
else else
{ {
u16 IMEBackup = REG_IME; u16 IMEBackup = REG_IME;
REG_IME = 0; REG_IME = 0;
gRfuStatic->unk_1a = Div(600, mcTimer); gRfuStatic->linkEmergencyLimit = Div(600, mcTimer);
REG_IME = IMEBackup; REG_IME = IMEBackup;
} }
} }
@@ -917,7 +917,7 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
if (gRfuStatic->linkEmergencyFlag[i] > 3) if (gRfuStatic->linkEmergencyFlag[i] > 3)
{ {
*bmLinkLossSlot |= newLinkLossFlag; *bmLinkLossSlot |= newLinkLossFlag;
*linkLossReason = reasonMaybe; // why not directly use REASON_LINK_LOSS? *linkLossReason = REASON_LINK_LOSS;
} }
} }
else else
@@ -928,17 +928,17 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0) if (gRfuFixed->STWIBuffer->rxPacketAlloc.rfuPacket8.data[7] == 0)
{ {
*bmLinkLossSlot |= newLinkLossFlag; *bmLinkLossSlot |= newLinkLossFlag;
*linkLossReason = reasonMaybe; // why not directly use REASON_LINK_LOSS? *linkLossReason = REASON_LINK_LOSS;
} }
else else
{ {
if (++gRfuStatic->linkEmergencyFlag[i] > gRfuStatic->unk_1a) if (++gRfuStatic->linkEmergencyFlag[i] > gRfuStatic->linkEmergencyLimit)
{ {
gRfuStatic->linkEmergencyFlag[i] = 0; gRfuStatic->linkEmergencyFlag[i] = 0;
STWI_send_DisconnectREQ(gRfuLinkStatus->connSlotFlag); STWI_send_DisconnectREQ(gRfuLinkStatus->connSlotFlag);
STWI_poll_CommandEnd(); STWI_poll_CommandEnd();
*bmLinkLossSlot |= newLinkLossFlag; *bmLinkLossSlot |= newLinkLossFlag;
*linkLossReason = reasonMaybe; // why not directly use REASON_LINK_LOSS? *linkLossReason = REASON_LINK_LOSS;
} }
} }
} }
@@ -946,7 +946,7 @@ u16 rfu_REQBN_watchLink(u16 reqCommandId, u8 *bmLinkLossSlot, u8 *linkLossReason
} }
else else
{ {
gRfuStatic->linkEmergencyFlag[i] = reqResult; // why not directly use 0? gRfuStatic->linkEmergencyFlag[i] = 0;
} }
} }
if (gRfuLinkStatus->parentChild == MODE_PARENT && gRfuLinkStatus->strength[i] != 0) if (gRfuLinkStatus->parentChild == MODE_PARENT && gRfuLinkStatus->strength[i] != 0)