dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1549 from GriffinRichards/doc-binterface

Browse Source 
Document remaining symbols in battle_interface, palette, and save
This commit is contained in:
GriffinR
2021-11-13 23:19:08 -05:00
committed by GitHub
parent b14fe9dce3 8e8b70c15c
commit 9a932cd9c3
26 changed files with 723 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+9 -10
View File
@@ -4654,30 +4654,29 @@ static void CB2_SaveAndEndTrade(void)
MysteryGift_TryIncrementStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
SetContinueGameWarpStatusToDynamicWarp();
sub_8153380();
LinkFullSave_Init();
gMain.state++;
sTradeData->timer = 0;
break;
case 51:
if (++sTradeData->timer == 5)
{
gMain.state++;
}
break;
case 52:
if (sub_81533AC())
if (LinkFullSave_WriteSector())
{
ClearContinueGameWarpStatus2();
gMain.state = 4;
}
else
{
// Save isn't finished, delay again
sTradeData->timer = 0;
gMain.state = 51;
}
break;
case 4:
sub_81533E0();
LinkFullSave_ReplaceLastSector();
gMain.state = 40;
sTradeData->timer = 0;
break;
@@ -4709,7 +4708,7 @@ static void CB2_SaveAndEndTrade(void)
case 42:
if (_IsLinkTaskFinished())
{
sub_8153408();
LinkFullSave_SetLastSectorSecurity();
gMain.state = 5;
}
break;
@@ -4965,7 +4964,7 @@ static void CB2_SaveAndEndWirelessTrade(void)
StringExpandPlaceholders(gStringVar4, gText_SavingDontTurnOffPower);
DrawTextOnTradeWindow(0, gStringVar4, 0);
IncrementGameStat(GAME_STAT_POKEMON_TRADES);
sub_8153380();
LinkFullSave_Init();
sTradeData->timer = 0;
}
break;
@@ -4974,7 +4973,7 @@ static void CB2_SaveAndEndWirelessTrade(void)
gMain.state = 4;
break;
case 4:
if (sub_81533AC())
if (LinkFullSave_WriteSector())
{
gMain.state = 5;
}
@@ -4985,7 +4984,7 @@ static void CB2_SaveAndEndWirelessTrade(void)
}
break;
case 5:
sub_81533E0();
LinkFullSave_ReplaceLastSector();
gMain.state = 6;
sTradeData->timer = 0;
break;
@@ -5013,7 +5012,7 @@ static void CB2_SaveAndEndWirelessTrade(void)
case 8:
if (_IsLinkTaskFinished())
{
sub_8153408();
LinkFullSave_SetLastSectorSecurity();
gMain.state = 9;
}
break;