dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Static symbols in easy_chat

Browse Source
This commit is contained in:
PikalaxALT
2019-11-01 15:59:24 -04:00
parent 486a3abf6b
commit 36bea47ea6
16 changed files with 198 additions and 6066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/easy_chat.c
+154 -4160
View File
File diff suppressed because it is too large Load Diff
src/mail.c
+2 -2
View File
@@ -70,8 +70,8 @@ struct MailViewResources {
u8 monIconSpriteId;
u8 unused;
u8 mailArrangementType;
void (*copyEasyChatWord)(u8 *dest, u16 word);
void (*convertEasyChatWordsToString)(u8 *dest, const u16 *src, u16 length1, u16 length2);
u8 *(*copyEasyChatWord)(u8 *dest, u16 word);
u8 *(*convertEasyChatWordsToString)(u8 *dest, const u16 *src, u16 length1, u16 length2);
const struct MailAttrStruct * messageLayout;
u16 bg1TilemapBuffer[BG_SCREEN_SIZE];
u16 bg2TilemapBuffer[BG_SCREEN_SIZE];
src/mevent.c
+1 -1
View File
@@ -772,7 +772,7 @@ void sub_81442CC(struct MEventStruct_Unk1442CC * data)
CopyTrainerId(data->unk_4C, gSaveBlock2Ptr->playerTrainerId);
StringCopy(data->unk_45, gSaveBlock2Ptr->playerName);
for (i = 0; i < 6; i++)
data->unk_50[i] = gSaveBlock1Ptr->unk2CA0[i];
data->unk_50[i] = gSaveBlock1Ptr->easyChatProfile[i];
memcpy(data->unk_5C, RomHeaderGameCode, 4);
data->unk_60 = RomHeaderSoftwareVersion;
}
src/trade_scene.c
+2 -1
View File
@@ -22,6 +22,7 @@
#include "script.h"
#include "event_data.h"
#include "string_util.h"
#include "mail.h"
#include "mail_data.h"
#include "pokeball.h"
#include "evolution_scene.h"
@@ -2484,7 +2485,7 @@ static void CreateInGameTradePokemonInternal(u8 playerSlot, u8 inGameTradeIdx)
static void GetInGameTradeMail(struct MailStruct * mail, const struct InGameTrade * inGameTrade)
{
int i;
for (i = 0; i < 9; i++)
for (i = 0; i < MAIL_WORDS_COUNT; i++)
mail->words[i] = sInGameTradeMailMessages[inGameTrade->mailNum][i];
StringCopy(mail->playerName, inGameTrade->otName);
mail->trainerId[0] = inGameTrade->otId >> 24;