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

Different amount of flags for seen vs caught

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-10 17:22:59 -03:00
parent 69243b7618
commit 0f53923bd9
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/pokedex.h
View file

@ -939,8 +939,6 @@ enum {
#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS
#endif
#define POKEMON_SLOTS_NUMBER (2047)
// Hoenn Pokedex order
enum {
HOENN_DEX_NONE,

7
include/global.h
View file

@ -135,7 +135,8 @@
#define ROUND_BITS_TO_BYTES(numBits) DIV_ROUND_UP(numBits, 8)
#define NUM_DEX_FLAG_BYTES ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER)
#define NUM_DEX_SEEN_FLAG_BYTES ROUND_BITS_TO_BYTES(2047)
#define NUM_DEX_CAUGHT_FLAG_BYTES ROUND_BITS_TO_BYTES(NATIONAL_DEX_COUNT)
#define NUM_FLAG_BYTES ROUND_BITS_TO_BYTES(FLAGS_COUNT)
#define NUM_ADDITIONAL_PHRASE_BYTES ROUND_BITS_TO_BYTES(NUM_ADDITIONAL_PHRASES)
@ -1003,8 +1004,6 @@ struct SaveBlock1
/*0x31DC*/ struct Roamer roamer;
/*0x31F8*/ struct EnigmaBerry enigmaBerry;
/*0x322C*/ struct MysteryGiftSave mysteryGift;
/*0x3???*/ u8 dexSeen[NUM_DEX_FLAG_BYTES];
/*0x3???*/ u8 dexCaught[NUM_DEX_FLAG_BYTES];
/*0x3???*/ u32 trainerHillTimes[NUM_TRAINER_HILL_MODES];
/*0x3???*/ struct RamScript ramScript;
/*0x3???*/ struct RecordMixingGift recordMixingGift;
@ -1013,6 +1012,8 @@ struct SaveBlock1
/*0x3???*/ u8 registeredTexts[UNION_ROOM_KB_ROW_COUNT][21];
/*0x3???*/ struct TrainerHillSave trainerHill;
/*0x3???*/ struct WaldaPhrase waldaPhrase;
/*0x3???*/ u8 dexSeen[NUM_DEX_SEEN_FLAG_BYTES];
/*0x3???*/ u8 dexCaught[NUM_DEX_CAUGHT_FLAG_BYTES];
// sizeof: 0x3???
};

5
src/pokedex.c
View file

@ -1514,12 +1514,11 @@ void ResetPokedex(void)
gSaveBlock2Ptr->pokedex.unownPersonality = 0;
gSaveBlock2Ptr->pokedex.spindaPersonality = 0;
DisableNationalPokedex();
for (i = 0; i < NUM_DEX_FLAG_BYTES; i++)
{
for (i = 0; i < NUM_DEX_CAUGHT_FLAG_BYTES; i++)
gSaveBlock1Ptr->dexCaught[i] = 0;
for (i = 0; i < NUM_DEX_SEEN_FLAG_BYTES; i++)
gSaveBlock1Ptr->dexSeen[i] = 0;
}
}
void ResetPokedexScrollPositions(void)
{