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

Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213)

Browse source 
* Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct

* Fixed SaveBlock1 comment (please squash)

* Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock
This commit is contained in:
Eduardo Quezada D'Ottone 2024-02-19 14:42:56 -03:00 committed by GitHub
parent 75ad61e5bf
commit 5e79fcd5b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/config/save.h
View file

@ -2,7 +2,7 @@
#define GUARD_CONFIG_SAVE_H
// SaveBlock1 configs
#define FREE_EXTRA_SEEN_FLAGS FALSE // Free up unused Pokédex seen flags (52 bytes).
#define FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK1 FALSE // Free up unused Pokédex seen flags (52 bytes).
#define FREE_TRAINER_HILL FALSE // Frees up Trainer Hill data (28 bytes).
#define FREE_MYSTERY_EVENT_BUFFERS FALSE // Frees up ramScript (1104 bytes).
#define FREE_MATCH_CALL FALSE // Frees up match call and rematch data. (104 bytes).
@ -15,8 +15,9 @@
#define FREE_BATTLE_TOWER_E_READER FALSE // Frees up Battle Tower E-Reader data (188 bytes).
#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).
// SaveBlock2 total: 1166 bytes
#define FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK2 FALSE // Free up unused Pokédex seen flags (108 bytes).
// SaveBlock2 total: 1274 bytes
// Grand Total: 3682
// Grand Total: 3790
#endif // GUARD_CONFIG_SAVE_H

6
include/global.h
View file

@ -190,7 +190,9 @@ struct Pokedex
/*0x04*/ u32 unownPersonality; // set when you first see Unown
/*0x08*/ u32 spindaPersonality; // set when you first see Spinda
/*0x0C*/ u32 unknown3;
#if FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK2 == FALSE
/*0x10*/ u8 filler[0x68]; // Previously Dex Flags, feel free to remove.
#endif //FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK2
};
struct PokemonJumpRecords
@ -997,9 +999,9 @@ struct SaveBlock1
/*0x690*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT];
/*0x790*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT];
/*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT];
#if FREE_EXTRA_SEEN_FLAGS == FALSE
#if FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK1 == FALSE
/*0x988*/ u8 filler1[0x34]; // Previously Dex Flags, feel free to remove.
#endif //FREE_EXTRA_SEEN_FLAGS
#endif //FREE_EXTRA_SEEN_FLAGS_SAVEBLOCK1
/*0x9BC*/ u16 berryBlenderRecords[3];
/*0x9C2*/ u8 unused_9C2[6];
#if FREE_MATCH_CALL == FALSE