Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2024-11-24 13:49:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

capitalize _Compare

Browse Source
This commit is contained in:
Laquin-Laquih 2023-06-04 20:23:12 +02:00
parent 02a02b34a8
commit 60353a98de
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_34.inc
View File

@ -30,7 +30,7 @@
.public BufferPlayersName
.public MailMsg_GetExpandedString
.public MailMsg_IsInit
.public MailMsg_compare
.public MailMsg_Compare
.public SetKeyRepeatTimers
.public FreeToHeap
.public InitBgFromTemplate

4
asm/overlay_34.s
View File

@ -1922,7 +1922,7 @@ _0225E450:
bne _0225E464
ldr r0, [sp]
add r1, #0x14
bl MailMsg_compare
bl MailMsg_Compare
cmp r0, #0
bne _0225E478
_0225E464:
@ -1957,7 +1957,7 @@ _0225E48E:
beq _0225E4A2
ldr r0, [sp]
add r1, #0x14
bl MailMsg_compare
bl MailMsg_Compare
_0225E4A2:
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}

2
include/mail.h
View File

@ -17,7 +17,7 @@ MAIL *Mail_New(HeapID heap_id);
void Mail_copy(const MAIL *src, MAIL *dest);
void Mail_init(MAIL *mail);
BOOL Mail_TypeIsValid(MAIL *mail);
BOOL Mail_compare(const MAIL *a, const MAIL *b);
BOOL Mail_Compare(const MAIL *a, const MAIL *b);
void Mail_SetNewMessageDetails(MAIL *mail, u8 mailType, u8 mon_no, SAVEDATA *saveData);
u32 Mail_GetOTID(const MAIL *mail);
u16 *Mail_GetAuthorNamePtr(MAIL *mail);

2
include/mail_message.h
View File

@ -28,7 +28,7 @@ typedef struct MailMessageTemplate {
} MAIL_MSG_TEMPLATE;
void MailMsg_init(MAIL_MESSAGE *msg);
BOOL MailMsg_compare(const MAIL_MESSAGE *a, const MAIL_MESSAGE *b);
BOOL MailMsg_Compare(const MAIL_MESSAGE *a, const MAIL_MESSAGE *b);
void MailMsg_SetMsgBankAndNum(MAIL_MESSAGE *mailMessage, u16 msg_bank, u16 msg_no);
void MailMsg_SetFieldI(MAIL_MESSAGE *mailMessage, u16 field_no, u16 ec_word);
void MailMsg_copy(MAIL_MESSAGE *dst, const MAIL_MESSAGE *src);

4
src/mail.c
View File

@ -61,7 +61,7 @@ void Mail_copy(const MAIL *src, MAIL *dst) {
MI_CpuCopy8(src, dst, sizeof(MAIL));
}
BOOL Mail_compare(const MAIL *a, const MAIL *b) {
BOOL Mail_Compare(const MAIL *a, const MAIL *b) {
int i;
if (a->author_otId != b->author_otId
|| a->author_gender != b->author_gender
@ -80,7 +80,7 @@ BOOL Mail_compare(const MAIL *a, const MAIL *b) {
}
}
for (i = 0; i < 3; i++) {
if (!MailMsg_compare(&a->unk_20[i], &b->unk_20[i])) {
if (!MailMsg_Compare(&a->unk_20[i], &b->unk_20[i])) {
return FALSE;
}
}

2
src/mail_message.c
View File

@ -130,7 +130,7 @@ u16 MailMsg_GetMsgNo(const MAIL_MESSAGE *mailMessage) {
return mailMessage->msg_no;
}
BOOL MailMsg_compare(const MAIL_MESSAGE *a, const MAIL_MESSAGE *b) {
BOOL MailMsg_Compare(const MAIL_MESSAGE *a, const MAIL_MESSAGE *b) {
int i;
if (a->msg_bank != b->msg_bank || a->msg_no != b->msg_no) {
return FALSE;

2
src/mail_misc.c
View File

@ -131,7 +131,7 @@ BOOL sub_02090DC0(Unk02090C94 *a0, MAIL_MESSAGE *msg1, MAIL_MESSAGE *msg2) {
return msg1->msg_bank == a0->unk1C[0] && msg1->msg_no == a0->unk1C[1];
case 2:
default:
return MailMsg_compare(&a0->mailMessage, msg2);
return MailMsg_Compare(&a0->mailMessage, msg2);
}
}

6
src/scrcmd_party.c
View File

@ -509,7 +509,7 @@ BOOL ScrCmd_KenyaCheck(SCRIPTCONTEXT *ctx) {
MAIL *kenyaMail = NPCTrade_MakeKenyaMail();
MAIL *mail = Mail_New(HEAP_ID_FIELD);
GetMonData(mon, MON_DATA_MAIL_STRUCT, mail);
*kenya = Mail_compare(kenyaMail, mail);
*kenya = Mail_Compare(kenyaMail, mail);
FreeToHeap(mail);
FreeToHeap(kenyaMail);
UnloadOverlayByID(FS_OVERLAY_ID(npc_trade));
@ -533,7 +533,7 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(SCRIPTCONTEXT *ctx) {
Pokemon *mon = GetPartyMonByIndex(party, i);
if (ItemIdIsMail(GetMonData(mon, MON_DATA_HELD_ITEM, NULL))) {
GetMonData(mon, MON_DATA_MAIL_STRUCT, mail);
if (Mail_compare(kenyaMail, mail)) {
if (Mail_Compare(kenyaMail, mail)) {
*kenya = TRUE;
FreeToHeap(mail);
FreeToHeap(kenyaMail);
@ -546,7 +546,7 @@ BOOL ScrCmd_KenyaCheckPartyOrMailbox(SCRIPTCONTEXT *ctx) {
i = 0;
while (TRUE) {
Mailbox_FetchMailToBuffer(mailbox->msgs, 0, i, mail);
if (Mail_TypeIsValid(mail) && Mail_compare(kenyaMail, mail)) {
if (Mail_TypeIsValid(mail) && Mail_Compare(kenyaMail, mail)) {
*kenya = TRUE;
break;
}