Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct #4213

Merged
merged 3 commits into from
Feb 19, 2024
Merged

Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e838a7d
Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct
AsparagusEduardo Feb 19, 2024
c506f7d
Fixed SaveBlock1 comment (please squash)
AsparagusEduardo Feb 19, 2024
1c5bd39
Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock
AsparagusEduardo Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/config/save.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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 changes: 4 additions & 2 deletions include/global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading