Merge pull request #15 from LOuroboros/patch-2

Updates for the saveblock branch
This commit is contained in:
ghoulslash 2022-01-13 19:30:40 -05:00 committed by GitHub
commit 62be2e37fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -15,15 +15,15 @@
// free saveblock 1 defines
#define FREE_EXTRA_SEEN_FLAGS //free up extra pokedex seen flags. Frees up 104 bytes
#define FREE_FIELD_3598 //frees up unused saveblock data. 384 bytes
//#define FREE_TRAINER_HILL //frees up trainer hill data. 28 bytes. WARNING THIS HAS BEEN SHOWN TO BREAK MULTI BATTLES
#define FREE_MYSTERY_EVENT_BUFFERS //frees up mystery event and ramScript. roughly 1880 bytes
//#define FREE_TRAINER_HILL //frees up trainer hill data. 28 bytes. WARNING THIS HAS BEEN SHOWN TO BREAK MULTI BATTLES
//#define FREE_MYSTERY_EVENT_BUFFERS //frees up mystery event and ramScript. roughly 1880 bytes Needed by FREE_BATTLE_TOWER_E_READER
#define FREE_MATCH_CALL //frees up match call data. 104 bytes
#define FREE_UNION_ROOM_CHAT //frees up field unk3C88. 210 bytes
#define FREE_ENIGMA_BERRY //frees up enigma berry. 52 bytes
#define FREE_LINK_BATTLE_RECORDS //frees link battle record data. 88 bytes
// saveblock1 total: 1846 bytes
//free saveblock 2 defines
#define FREE_BATTLE_TOWER_E_READER //frees up battle tower e reader trainer data. 188 bytes
//#define FREE_BATTLE_TOWER_E_READER //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 //frees up pokemon jump data. 16 bytes
#define FREE_RECORD_MIXING_HALL_RECORDS //frees up hall records for record mixing. 1032 bytes
// saveblock2 total: 1236 bytes

View File

@ -917,7 +917,7 @@ static void InitUnionRoomChat(struct UnionRoomChat *chat)
PrepareSendBuffer_Null(chat->sendMessageBuffer);
#ifndef FREE_UNION_ROOM_CHAT
for (i = 0; i < UNION_ROOM_KB_ROW_COUNT; i++)
StringCopy(unionRoomChat->registeredTexts[i], gSaveBlock1Ptr->registeredTexts[i]);
StringCopy(chat->registeredTexts[i], gSaveBlock1Ptr->registeredTexts[i]);
#endif
}