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

Sync link.c

Browse Source
This commit is contained in:
GriffinR
2022-11-01 23:09:17 -04:00
parent 2abdb6aa41
commit d8aa1ce2bf
12 changed files with 369 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link.c
+307 -455
View File
File diff suppressed because it is too large Load Diff
src/menu_helpers.c
+1 -1
View File
@@ -134,7 +134,7 @@ bool8 sub_80BF748(void)
{
if (MenuHelpers_CallLinkSomething() == TRUE)
return TRUE;
else if (LinkRecvQueueLengthMoreThan2() != TRUE)
else if (IsLinkRecvQueueAtOverworldMax() != TRUE)
return FALSE;
else
return TRUE;
src/mevent.c
+2 -2
View File
@@ -210,7 +210,7 @@ static u32 EReaderReceive(u8 * state_p, u16 * receiveDelay)
}
break;
case 4:
Link_StartSend5FFFwithParam(0);
SetCloseLinkCallbackAndType(0);
*state_p = 5;
break;
case 5:
@@ -416,7 +416,7 @@ static void Task_EReaderComm(u8 taskId)
break;
case 15:
data->initialSendResult = ValidateTrainerTowerData((struct EReaderTrainerTowerSet *)gDecompressionBuffer);
Link_StartSend5FFFwithParam(data->initialSendResult);
SetCloseLinkCallbackAndType(data->initialSendResult);
data->state = 16;
break;
case 16:
src/pokemon_summary_screen.c
+6 -6
View File
@@ -1119,7 +1119,7 @@ static void Task_InputHandler_Info(u8 taskId)
case PSS_STATE3270_HANDLEINPUT:
if (MenuHelpers_CallLinkSomething() == TRUE)
return;
else if (LinkRecvQueueLengthMoreThan2() == TRUE)
else if (IsLinkRecvQueueAtOverworldMax() == TRUE)
return;
else if (FuncIsActiveTask(Task_PokeSum_SwitchDisplayedPokemon))
return;
@@ -1218,7 +1218,7 @@ static void Task_InputHandler_Info(u8 taskId)
case PSS_STATE3270_ATEXIT_WAITLINKDELAY:
if (Overworld_LinkRecvQueueLengthMoreThan2() == TRUE)
return;
else if (LinkRecvQueueLengthMoreThan2() == TRUE)
else if (IsLinkRecvQueueAtOverworldMax() == TRUE)
return;
sMonSummaryScreen->state3270 = PSS_STATE3270_ATEXIT_WAITFADE;
@@ -3501,7 +3501,7 @@ static void Task_HandleInput_SelectMove(u8 taskId)
switch (sMonSummaryScreen->selectMoveInputHandlerState)
{
case 0:
if (MenuHelpers_CallLinkSomething() == TRUE || LinkRecvQueueLengthMoreThan2() == TRUE)
if (MenuHelpers_CallLinkSomething() == TRUE || IsLinkRecvQueueAtOverworldMax() == TRUE)
return;
if (JOY_NEW(DPAD_UP))
@@ -3662,7 +3662,7 @@ static void Task_HandleInput_SelectMove(u8 taskId)
sMonSummaryScreen->selectMoveInputHandlerState = 3;
break;
case 3:
if (MenuHelpers_CallLinkSomething() == TRUE || LinkRecvQueueLengthMoreThan2() == TRUE)
if (MenuHelpers_CallLinkSomething() == TRUE || IsLinkRecvQueueAtOverworldMax() == TRUE)
return;
CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2);
@@ -3880,7 +3880,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId)
sMonSummaryScreen->selectMoveInputHandlerState = 4;
break;
case 4:
if (MenuHelpers_CallLinkSomething() == TRUE || LinkRecvQueueLengthMoreThan2() == TRUE)
if (MenuHelpers_CallLinkSomething() == TRUE || IsLinkRecvQueueAtOverworldMax() == TRUE)
return;
CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2);
@@ -5148,7 +5148,7 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId)
sMonSummaryScreen->switchMonTaskState++;
break;
case 11:
if (!Overworld_LinkRecvQueueLengthMoreThan2() && !LinkRecvQueueLengthMoreThan2())
if (!Overworld_LinkRecvQueueLengthMoreThan2() && !IsLinkRecvQueueAtOverworldMax())
{
PokeSum_CreateSprites();
PokeSum_TryPlayMonCry();
src/reset_save_heap.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "new_game.h"
#include "overworld.h"
void ResetSaveHeap(void)
void ReloadSave(void)
{
u16 imeBackup = REG_IME;
src/trade.c
+2 -2
View File
@@ -1200,7 +1200,7 @@ static void TradeMenuCB_10(void)
}
else
{
Link_StartSend5FFFwithParam(32);
SetCloseLinkCallbackAndType(32);
sTradeMenuResourcesPtr->tradeMenuCBnum = 13;
}
}
@@ -1985,7 +1985,7 @@ static void TradeMenuCB_11(void)
}
else
{
Link_StartSend5FFFwithParam(12);
SetCloseLinkCallbackAndType(12);
}
sTradeMenuResourcesPtr->tradeMenuCBnum = 12;