diff --git a/include/global.h b/include/global.h index e9824e7dc..1b39913a3 100644 --- a/include/global.h +++ b/include/global.h @@ -854,7 +854,9 @@ struct SaveBlock1 /*0x3A08*/ struct RecordMixingGift recordMixingGift; // unused /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH + 1]; /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; +#if FREE_UNION_ROOM_CHAT == FALSE /*0x3AD4*/ u8 registeredTexts[UNION_ROOM_KB_ROW_COUNT][21]; +#endif //FREE_UNION_ROOM_CHAT /*0x3BA8*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C98*/ struct DaycareMon route5DayCareMon; /*0x3D34*/ u32 towerChallengeId; diff --git a/src/union_room_chat.c b/src/union_room_chat.c index aedc57fdc..2f4bb3eb5 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -326,7 +326,9 @@ void EnterUnionRoomChat(void) static void InitChatWork(struct UnionRoomChat * unionRoomChat) { +#if FREE_UNION_ROOM_CHAT == FALSE int i; +#endif //FREE_UNION_ROOM_CHAT unionRoomChat->routineNo = CHATENTRYROUTINE_JOIN; unionRoomChat->routineState = 0; @@ -342,8 +344,10 @@ static void InitChatWork(struct UnionRoomChat * unionRoomChat) unionRoomChat->exitType = 0; unionRoomChat->changedRegisteredTexts = FALSE; PrepareSendBuffer_Null(unionRoomChat->sendMessageBuffer); +#if FREE_UNION_ROOM_CHAT == FALSE for (i = 0; i < UNION_ROOM_KB_ROW_COUNT; i++) StringCopy(unionRoomChat->registeredTexts[i], gSaveBlock1Ptr->registeredTexts[i]); +#endif //FREE_UNION_ROOM_CHAT } static void FreeChatWork(void) @@ -1174,9 +1178,11 @@ static void ResetMessageEntryBuffer(void) static void SaveRegisteredTextsToSB1(void) { +#if FREE_UNION_ROOM_CHAT == FALSE int i; for (i = 0; i < UNION_ROOM_KB_ROW_COUNT; i++) StringCopy(gSaveBlock1Ptr->registeredTexts[i], sWork->registeredTexts[i]); +#endif //FREE_UNION_ROOM_CHAT } u8 *UnionRoomChat_GetWorkRegisteredText(int arg0) @@ -1422,6 +1428,7 @@ u8 *UnionRoomChat_GetNameOfPlayerWhoDisbandedChat(void) void UnionRoomChat_InitializeRegisteredTexts(void) { +#if FREE_UNION_ROOM_CHAT == FALSE StringCopy(gSaveBlock1Ptr->registeredTexts[0], gText_Hello); StringCopy(gSaveBlock1Ptr->registeredTexts[1], gText_Pokemon2); StringCopy(gSaveBlock1Ptr->registeredTexts[2], gText_Trade); @@ -1432,6 +1439,7 @@ void UnionRoomChat_InitializeRegisteredTexts(void) StringCopy(gSaveBlock1Ptr->registeredTexts[7], gText_YaySmileEmoji); StringCopy(gSaveBlock1Ptr->registeredTexts[8], gText_ThankYou); StringCopy(gSaveBlock1Ptr->registeredTexts[9], gText_ByeBye); +#endif //FREE_UNION_ROOM_CHAT } #define tState data[0]