atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix FREE_RECORD_MIXING_HALL_RECORDS

Browse source
This commit is contained in:
Bassoonian 2024-02-02 13:46:19 +01:00
parent 90be8436d9
commit 27a65a5961
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config/save.h
View file

@ -13,7 +13,7 @@
//free saveblock 2 defines
#define FREE_BATTLE_TOWER_E_READER FALSE //frees up battle tower e reader trainer data. 188 bytes. WARNING THIS HAS BEEN SHOWN TO BREAK THE POKÉ MARTS' QUESTIONNAIRE
#define FREE_POKEMON_JUMP FALSE // Frees up Pokémon Jump data (16 bytes).
#define FREE_RECORD_MIXING_HALL_RECORDS FALSE //frees up hall records for record mixing. 1032 bytes
#define FREE_RECORD_MIXING_HALL_RECORDS FALSE // Frees up hall records for record mixing (1032 bytes).
// saveblock2 total: 1236 bytes
//grand total: 3082

8
src/record_mixing.c
View file

@ -97,7 +97,9 @@ static void *sApprenticesSave;
static void *sBattleTowerSave_Duplicate;
static u32 sRecordStructSize;
static u8 sDaycareMailRandSum;
#if FREE_RECORD_MIXING_HALL_RECORDS == FALSE
static struct PlayerHallRecords *sPartnerHallRecords[HALL_RECORDS_COUNT];
#endif //FREE_RECORD_MIXING_HALL_RECORDS
static EWRAM_DATA struct RecordMixingDaycareMail sRecordMixMail = {0};
static EWRAM_DATA union PlayerRecord *sReceivedRecords = NULL;
@ -1198,9 +1200,9 @@ static void ReceiveApprenticeData(struct Apprentice *records, size_t recordSize,
}
}
#if FREE_RECORD_MIXING_HALL_RECORDS == FALSE
static void GetNewHallRecords(struct RecordMixingHallRecords *dst, void *records, size_t recordSize, u32 multiplayerId, s32 linkPlayerCount)
{
#if FREE_RECORD_MIXING_HALL_RECORDS == FALSE
s32 i, j, k, l;
s32 repeatTrainers;
@ -1276,7 +1278,6 @@ static void GetNewHallRecords(struct RecordMixingHallRecords *dst, void *records
dst->hallRecords2P[j][k + HALL_RECORDS_COUNT] = sPartnerHallRecords[k]->twoPlayers[j];
}
}
#endif //FREE_RECORD_MIXING_HALL_RECORDS
}
static void FillWinStreakRecords1P(struct RankingHall1P *playerRecords, struct RankingHall1P *mixRecords)
@ -1337,7 +1338,6 @@ static void FillWinStreakRecords2P(struct RankingHall2P *playerRecords, struct R
static void SaveHighestWinStreakRecords(struct RecordMixingHallRecords *mixHallRecords)
{
#if FREE_RECORD_MIXING_HALL_RECORDS == FALSE
s32 i, j;
for (i = 0; i < HALL_FACILITIES_COUNT; i++)
@ -1348,8 +1348,8 @@ static void SaveHighestWinStreakRecords(struct RecordMixingHallRecords *mixHallR
for (j = 0; j < FRONTIER_LVL_MODE_COUNT; j++)
FillWinStreakRecords2P(gSaveBlock2Ptr->hallRecords2P[j], mixHallRecords->hallRecords2P[j]);
#endif //FREE_RECORD_MIXING_HALL_RECORDS
}
#endif //FREE_RECORD_MIXING_HALL_RECORDS
static void ReceiveRankingHallRecords(struct PlayerHallRecords *records, size_t recordSize, u32 multiplayerId)
{