Add revision 10 changes (#722)
* revision 10 changes * add rev10 to github actions * add no-intro entry for leafgreen rev10
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
#include "constants/songs.h"
|
||||
#include "constants/region_map_sections.h"
|
||||
#include "constants/moves.h"
|
||||
#include "sloopsvc.h"
|
||||
|
||||
// Values for signaling to/from the link partner
|
||||
enum {
|
||||
@@ -2608,25 +2609,37 @@ static void CB2_SaveAndEndTrade(void)
|
||||
MysteryGift_TryIncrementStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId);
|
||||
SetContinueGameWarpStatusToDynamicWarp();
|
||||
LinkFullSave_Init();
|
||||
#if REVISION >= 0xA
|
||||
// No need to wait for a save when the emulator does it fast and synchronously
|
||||
gMain.state = 52;
|
||||
#else
|
||||
gMain.state++;
|
||||
#endif
|
||||
sTradeAnim->timer = 0;
|
||||
break;
|
||||
#if REVISION >= 0xA
|
||||
#else
|
||||
case 51:
|
||||
if (++sTradeAnim->timer == 5)
|
||||
gMain.state++;
|
||||
break;
|
||||
#endif
|
||||
case 52:
|
||||
if (LinkFullSave_WriteSector())
|
||||
{
|
||||
ClearContinueGameWarpStatus2();
|
||||
gMain.state = 4;
|
||||
}
|
||||
#if REVISION >= 0xA
|
||||
// Save delay is gone, just write the next sector if save isn't finished
|
||||
#else
|
||||
else
|
||||
{
|
||||
// Save isn't finished, delay again
|
||||
sTradeAnim->timer = 0;
|
||||
gMain.state = 51;
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case 4:
|
||||
LinkFullSave_ReplaceLastSector();
|
||||
@@ -2654,6 +2667,26 @@ static void CB2_SaveAndEndTrade(void)
|
||||
sTradeAnim->timer--;
|
||||
}
|
||||
break;
|
||||
#if REVISION >= 0xA
|
||||
case 42:
|
||||
if (IsLinkTaskFinished())
|
||||
{
|
||||
gMain.state = 43;
|
||||
}
|
||||
break;
|
||||
case 43:
|
||||
SetLinkStandbyCallback();
|
||||
gMain.state = 44;
|
||||
break;
|
||||
case 44:
|
||||
if (IsLinkTaskFinished())
|
||||
{
|
||||
LinkFullSave_SetLastSectorSignature();
|
||||
svc_FinishSave();
|
||||
gMain.state = 5;
|
||||
}
|
||||
break;
|
||||
#else
|
||||
case 42:
|
||||
if (IsLinkTaskFinished())
|
||||
{
|
||||
@@ -2661,6 +2694,7 @@ static void CB2_SaveAndEndTrade(void)
|
||||
gMain.state = 5;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case 5:
|
||||
if (++sTradeAnim->timer > 60)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user