Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FREE_ENIGMA_BERRY

Browse Source
This commit is contained in:
Bassoonian 2024-02-02 15:01:50 +01:00
parent cc57452695
commit a1c17a1de7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config/save.h
View File

@ -7,7 +7,7 @@
#define FREE_MYSTERY_EVENT_BUFFERS FALSE //frees up mystery event and ramScript. roughly 1880 bytes Needed by FREE_BATTLE_TOWER_E_READER
#define FREE_MATCH_CALL FALSE // Frees up match call and rematch data. (104 bytes).
#define FREE_UNION_ROOM_CHAT FALSE // Frees up union room chat (212 bytes).
#define FREE_ENIGMA_BERRY FALSE //frees up enigma berry. 52 bytes
#define FREE_ENIGMA_BERRY FALSE // Frees up E-Reader Enigma Berry data (52 bytes).
#define FREE_LINK_BATTLE_RECORDS FALSE //frees link battle record data. 88 bytes
// saveblock1 total: 1846 bytes
//free saveblock 2 defines

7
src/berry.c
View File

@ -15,7 +15,6 @@
#include "constants/event_object_movement.h"
#include "constants/items.h"
static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
static u16 BerryTypeToItemId(u16 berry);
static u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree);
static u8 GetNumStagesWateredByBerryTreeId(u8 id);
@ -1678,9 +1677,9 @@ void SetEnigmaBerry(u8 *src)
#endif //FREE_ENIGMA_BERRY
}
#if FREE_ENIGMA_BERRY == FALSE
static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
{
#if FREE_ENIGMA_BERRY == FALSE
u32 i;
u32 checksum;
u8 *dest;
@ -1691,10 +1690,8 @@ static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
checksum += dest[i];
return checksum;
#else
return 0;
#endif //FREE_ENIGMA_BERRY
}
#endif //FREE_ENIGMA_BERRY
bool32 IsEnigmaBerryValid(void)
{