Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-10-02 06:37:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Random EWRAM and IWRAM savings (#9231)

Browse Source
This commit is contained in:
Estellar
2026-03-03 20:21:34 -03:00
committed by GitHub
parent 21be66b174
commit 65e2f409d2
3 changed files with 68 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/link_rfu_2.c
View File

@@ -65,16 +65,11 @@ struct SioInfo
// its fields was largely removed before release
struct RfuDebug
{
u8 unused0[6];
u16 recvCount;
u8 unused1[6];
vu8 unkFlag;
u8 childJoinCount;
u8 unused2[84];
u16 blockSendFailures;
u8 unused3[29];
u8 childJoinCount;
u8 blockSendTime;
u8 unused4[88];
u8 padding[2];
};
COMMON_DATA u32 gRfuAPIBuffer[RFU_API_BUFF_SIZE_RAM / 4] = {0};
@@ -878,7 +873,6 @@ static bool32 RfuMain2_Parent(void)
CallRfuFunc();
if (gRfu.nextChildBits && !gRfu.stopNewConnections)
{
sRfuDebug.unkFlag = FALSE;
rfu_clearSlot(TYPE_UNI_SEND | TYPE_UNI_RECV, gRfu.parentSendSlot);
for (i = 0; i < RFU_CHILD_MAX; i++)
{

2
src/save.c
View File

@@ -89,11 +89,9 @@ COMMON_DATA u32 gDamagedSaveSectors = 0;
COMMON_DATA u32 gSaveCounter = 0;
COMMON_DATA struct SaveSector *gReadWriteSector = NULL; // Pointer to a buffer for reading/writing a sector
COMMON_DATA u16 gIncrementalSectorId = 0;
COMMON_DATA u16 gSaveUnusedVar = 0;
COMMON_DATA u16 gSaveFileStatus = 0;
COMMON_DATA MainCallback gGameContinueCallback = NULL;
COMMON_DATA struct SaveSectorLocation gRamSaveSectorLocations[NUM_SECTORS_PER_SLOT] = {0};
COMMON_DATA u16 gSaveUnusedVar2 = 0;
COMMON_DATA u16 gSaveAttemptStatus = 0;
EWRAM_DATA struct SaveSector gSaveDataBuffer = {0}; // Buffer used for reading/writing sectors

149
src/tv.c
View File

@@ -64,25 +64,14 @@ enum {
};
COMMON_DATA s8 sCurTVShowSlot = 0;
COMMON_DATA u16 sTV_SecretBaseVisitMovesTemp[8] = {0};
COMMON_DATA u8 sTV_DecorationsBuffer[DECOR_MAX_SECRET_BASE] = {0};
COMMON_DATA struct {
u8 level;
u16 species;
u16 move;
} sTV_SecretBaseVisitMonsTemp[10] = {0};
static u8 sTVShowMixingNumPlayers;
static u8 sTVShowNewsMixingNumPlayers;
static s8 sTVShowMixingCurSlot;
static EWRAM_DATA u16 sPokemonAnglerSpecies = 0;
static EWRAM_DATA u16 sPokemonAnglerAttemptCounters = 0;
static EWRAM_DATA u16 sFindThatGamerCoinsSpent = 0;
static EWRAM_DATA u8 sFindThatGamerWhichGame = SLOT_MACHINE;
static EWRAM_DATA ALIGNED(4) u8 sRecordMixingPartnersWithoutShowsToShare = 0;
static EWRAM_DATA ALIGNED(4) u8 sTVShowState = 0;
static EWRAM_DATA u8 sTVSecretBaseSecretsRandomValues[3] = {};
static void ClearPokeNews(void);
static u8 GetTVGroupByShowId(u8);
@@ -1975,32 +1964,32 @@ void AlertTVThatPlayerPlayedRoulette(u16 nCoinsSpent)
static void SecretBaseVisit_CalculateDecorationData(TVShow *show)
{
u8 i, j;
u8 n;
u8 decorationsBuffer[DECOR_MAX_SECRET_BASE] = {0};
u8 decoration;
u8 n = 0;
for (i = 0; i < DECOR_MAX_SECRET_BASE; i++)
sTV_DecorationsBuffer[i] = DECOR_NONE;
for (u32 i = 0; i < DECOR_MAX_SECRET_BASE; i++)
decorationsBuffer[i] = DECOR_NONE;
// Count (and save) the unique decorations in the base
for (i = 0, n = 0; i < DECOR_MAX_SECRET_BASE; i++)
for (u32 i = 0; i < DECOR_MAX_SECRET_BASE; i++)
{
decoration = gSaveBlock1Ptr->secretBases[0].decorations[i];
if (decoration != DECOR_NONE)
{
// Search for an empty spot to save decoration
for (j = 0; j < DECOR_MAX_SECRET_BASE; j++)
for (u32 j = 0; j < DECOR_MAX_SECRET_BASE; j++)
{
if (sTV_DecorationsBuffer[j] == DECOR_NONE)
if (decorationsBuffer[j] == DECOR_NONE)
{
// Save and count new unique decoration
sTV_DecorationsBuffer[j] = decoration;
decorationsBuffer[j] = decoration;
n++;
break;
}
// Decoration has already been saved, skip and move on to the next base decoration
if (sTV_DecorationsBuffer[j] == decoration)
if (decorationsBuffer[j] == decoration)
break;
}
}
@@ -2017,75 +2006,65 @@ static void SecretBaseVisit_CalculateDecorationData(TVShow *show)
case 0:
break;
case 1:
show->secretBaseVisit.decorations[0] = sTV_DecorationsBuffer[0];
show->secretBaseVisit.decorations[0] = decorationsBuffer[0];
break;
default:
// More than 1 decoration, randomize the full list
Shuffle(sTV_DecorationsBuffer, n, sizeof(sTV_DecorationsBuffer[0]));
Shuffle(decorationsBuffer, n, sizeof(decorationsBuffer[0]));
// Pick the first decorations in the randomized list to talk about on the show
for (i = 0; i < show->secretBaseVisit.numDecorations; i++)
show->secretBaseVisit.decorations[i] = sTV_DecorationsBuffer[i];
for (u32 i = 0; i < show->secretBaseVisit.numDecorations; i++)
show->secretBaseVisit.decorations[i] = decorationsBuffer[i];
break;
}
}
static void SecretBaseVisit_CalculatePartyData(TVShow *show)
{
u8 i;
enum Move move;
u16 j;
u8 numMoves;
u8 numPokemon;
u16 sum;
struct
{
enum Move move;
u16 species;
u8 level;
} secretBaseVisitMonsTemp[PARTY_SIZE] = {0};
for (i = 0, numPokemon = 0; i < PARTY_SIZE; i++)
u8 numPokemon = 0;
for (u32 i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
{
sTV_SecretBaseVisitMonsTemp[numPokemon].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
sTV_SecretBaseVisitMonsTemp[numPokemon].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
enum Move monMoves[MAX_MON_MOVES];
u8 moveNum = 0;
secretBaseVisitMonsTemp[numPokemon].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
secretBaseVisitMonsTemp[numPokemon].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
// Check all the Pokémon's moves, then randomly select one to save
numMoves = 0;
move = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1);
if (move != MOVE_NONE)
for (u32 moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++)
{
sTV_SecretBaseVisitMovesTemp[numMoves] = move;
numMoves++;
enum Move move = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + moveIndex);
if (move != MOVE_NONE)
{
monMoves[moveNum] = move;
moveNum++;
}
}
move = GetMonData(&gPlayerParty[i], MON_DATA_MOVE2);
if (move != MOVE_NONE)
{
sTV_SecretBaseVisitMovesTemp[numMoves] = move;
numMoves++;
}
move = GetMonData(&gPlayerParty[i], MON_DATA_MOVE3);
if (move != MOVE_NONE)
{
sTV_SecretBaseVisitMovesTemp[numMoves] = move;
numMoves++;
}
move = GetMonData(&gPlayerParty[i], MON_DATA_MOVE4);
if (move != MOVE_NONE)
{
sTV_SecretBaseVisitMovesTemp[numMoves] = move;
numMoves++;
}
sTV_SecretBaseVisitMonsTemp[numPokemon].move = sTV_SecretBaseVisitMovesTemp[Random() % numMoves];
secretBaseVisitMonsTemp[numPokemon].move = monMoves[Random() % moveNum];
numPokemon++;
}
}
for (i = 0, sum = 0; i < numPokemon; i++)
sum += sTV_SecretBaseVisitMonsTemp[i].level;
u16 sum = 0;
for (u32 i = 0; i < numPokemon; i++)
sum += secretBaseVisitMonsTemp[i].level;
// Using the data calculated above, save the data to talk about on the show
// (average level, and one randomly selected species / move)
u16 monIndex = Random() % numPokemon;
show->secretBaseVisit.avgLevel = sum / numPokemon;
j = Random() % numPokemon;
show->secretBaseVisit.species = sTV_SecretBaseVisitMonsTemp[j].species;
show->secretBaseVisit.move = sTV_SecretBaseVisitMonsTemp[j].move;
show->secretBaseVisit.species = secretBaseVisitMonsTemp[monIndex].species;
show->secretBaseVisit.move = secretBaseVisitMonsTemp[monIndex].move;
}
void TryPutSecretBaseVisitOnAir(void)
@@ -3472,10 +3451,11 @@ static void SetMixedTVShows(TVShow player1[TV_SHOWS_COUNT], TVShow player2[TV_SH
tvShows[1] = &player2;
tvShows[2] = &player3;
tvShows[3] = &player4;
sTVShowMixingNumPlayers = GetLinkPlayerCount();
u8 tvShowMixingNumPlayers = GetLinkPlayerCount();
while (1)
{
for (i = 0; i < sTVShowMixingNumPlayers; i++)
for (i = 0; i < tvShowMixingNumPlayers; i++)
{
if (i == 0)
sRecordMixingPartnersWithoutShowsToShare = 0;
@@ -3484,19 +3464,19 @@ static void SetMixedTVShows(TVShow player1[TV_SHOWS_COUNT], TVShow player2[TV_SH
if (sTVShowMixingCurSlot == -1)
{
sRecordMixingPartnersWithoutShowsToShare++;
if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers)
if (sRecordMixingPartnersWithoutShowsToShare == tvShowMixingNumPlayers)
return;
}
else
{
for (j = 0; j < sTVShowMixingNumPlayers - 1; j++)
for (j = 0; j < tvShowMixingNumPlayers - 1; j++)
{
sCurTVShowSlot = FindFirstEmptyRecordMixTVShowSlot(tvShows[(i + j + 1) % sTVShowMixingNumPlayers][0]);
sCurTVShowSlot = FindFirstEmptyRecordMixTVShowSlot(tvShows[(i + j + 1) % tvShowMixingNumPlayers][0]);
if (sCurTVShowSlot != -1
&& TryMixTVShow(&tvShows[(i + j + 1) % sTVShowMixingNumPlayers][0], &tvShows[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1)
&& TryMixTVShow(&tvShows[(i + j + 1) % tvShowMixingNumPlayers][0], &tvShows[i][0], (i + j + 1) % tvShowMixingNumPlayers) == 1)
break;
}
if (j == sTVShowMixingNumPlayers - 1)
if (j == tvShowMixingNumPlayers - 1)
DeleteTVShowInArrayByIdx(tvShows[i][0], sTVShowMixingCurSlot);
}
}
@@ -3844,19 +3824,19 @@ static void SetMixedPokeNews(PokeNews player1[POKE_NEWS_COUNT], PokeNews player2
pokeNews[1] = &player2;
pokeNews[2] = &player3;
pokeNews[3] = &player4;
sTVShowNewsMixingNumPlayers = GetLinkPlayerCount();
u8 tvShowNewsMixingNumPlayers = GetLinkPlayerCount();
for (i = 0; i < POKE_NEWS_COUNT; i++)
{
for (j = 0; j < sTVShowNewsMixingNumPlayers; j++)
for (j = 0; j < tvShowNewsMixingNumPlayers; j++)
{
sTVShowMixingCurSlot = GetPokeNewsSlotIfActive(*pokeNews[j], i);
if (sTVShowMixingCurSlot != -1)
{
for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++)
for (k = 0; k < tvShowNewsMixingNumPlayers - 1; k++)
{
sCurTVShowSlot = GetFirstEmptyPokeNewsSlot(*pokeNews[(j + k + 1) % sTVShowNewsMixingNumPlayers]);
sCurTVShowSlot = GetFirstEmptyPokeNewsSlot(*pokeNews[(j + k + 1) % tvShowNewsMixingNumPlayers]);
if (sCurTVShowSlot != -1)
InitTryMixPokeNewsShow(pokeNews[(j + k + 1) % sTVShowNewsMixingNumPlayers], pokeNews[j]);
InitTryMixPokeNewsShow(pokeNews[(j + k + 1) % tvShowNewsMixingNumPlayers], pokeNews[j]);
}
}
}
@@ -6573,6 +6553,9 @@ static void DoTVShowSecretBaseSecrets(void)
show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
gSpecialVar_Result = FALSE;
state = sTVShowState;
u8 tvSecretBaseSecretsRandomValues[3] = {};
switch (state)
{
case SBSECRETS_STATE_INTRO:
@@ -6586,8 +6569,8 @@ static void DoTVShowSecretBaseSecrets(void)
else
{
show->secretBaseSecrets.savedState = SBSECRETS_STATE_DO_NEXT1;
sTVSecretBaseSecretsRandomValues[0] = Random() % numActions;
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
tvSecretBaseSecretsRandomValues[0] = Random() % numActions;
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, tvSecretBaseSecretsRandomValues[0]);
}
break;
case SBSECRETS_STATE_DO_NEXT1:
@@ -6600,7 +6583,7 @@ static void DoTVShowSecretBaseSecrets(void)
break;
case 2:
show->secretBaseSecrets.savedState = SBSECRETS_STATE_DO_NEXT2;
if (sTVSecretBaseSecretsRandomValues[0] == 0)
if (tvSecretBaseSecretsRandomValues[0] == 0)
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, 1);
else
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, 0);
@@ -6608,12 +6591,12 @@ static void DoTVShowSecretBaseSecrets(void)
default:
for (i = 0; i < 0xFFFF; i++)
{
sTVSecretBaseSecretsRandomValues[1] = Random() % numActions;
if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0])
tvSecretBaseSecretsRandomValues[1] = Random() % numActions;
if (tvSecretBaseSecretsRandomValues[1] != tvSecretBaseSecretsRandomValues[0])
break;
}
show->secretBaseSecrets.savedState = SBSECRETS_STATE_DO_NEXT2;
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, tvSecretBaseSecretsRandomValues[1]);
break;
}
break;
@@ -6628,12 +6611,12 @@ static void DoTVShowSecretBaseSecrets(void)
{
for (i = 0; i < 0xFFFF; i++)
{
sTVSecretBaseSecretsRandomValues[2] = Random() % numActions;
if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1])
tvSecretBaseSecretsRandomValues[2] = Random() % numActions;
if (tvSecretBaseSecretsRandomValues[2] != tvSecretBaseSecretsRandomValues[0] && tvSecretBaseSecretsRandomValues[2] != tvSecretBaseSecretsRandomValues[1])
break;
}
show->secretBaseSecrets.savedState = SBSECRETS_STATE_TOOK_X_STEPS;
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
sTVShowState = SecretBaseSecrets_GetStateByFlagNumber(show, tvSecretBaseSecretsRandomValues[2]);
}
break;
case SBSECRETS_STATE_TOOK_X_STEPS: