ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Record mixing fakematch fixed!

Browse Source
This commit is contained in:
PokeCodec 2020-09-09 15:23:52 -04:00
parent dc34cf1711
commit 84a92279c9
3 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/dewford_trend.c
View File

@ -245,46 +245,46 @@ static bool8 sub_8122A58(struct EasyChatPair *a, struct EasyChatPair *b, u8 c)
{ {
case 0: case 0:
if (a->unk0_0 > b->unk0_0) if (a->unk0_0 > b->unk0_0)
return 1; return TRUE;
if (a->unk0_0 < b->unk0_0) if (a->unk0_0 < b->unk0_0)
return 0; return FALSE;
if (a->unk0_7 > b->unk0_7) if (a->unk0_7 > b->unk0_7)
return 1; return TRUE;
if (a->unk0_7 < b->unk0_7) if (a->unk0_7 < b->unk0_7)
return 0; return FALSE;
break; break;
case 1: case 1:
if (a->unk0_7 > b->unk0_7) if (a->unk0_7 > b->unk0_7)
return 1; return TRUE;
if (a->unk0_7 < b->unk0_7) if (a->unk0_7 < b->unk0_7)
return 0; return FALSE;
if (a->unk0_0 > b->unk0_0) if (a->unk0_0 > b->unk0_0)
return 1; return TRUE;
if (a->unk0_0 < b->unk0_0) if (a->unk0_0 < b->unk0_0)
return 0; return FALSE;
break; break;
case 2: case 2:
if (a->unk0_0 > b->unk0_0) if (a->unk0_0 > b->unk0_0)
return 1; return TRUE;
if (a->unk0_0 < b->unk0_0) if (a->unk0_0 < b->unk0_0)
return 0; return FALSE;
if (a->unk0_7 > b->unk0_7) if (a->unk0_7 > b->unk0_7)
return 1; return TRUE;
if (a->unk0_7 < b->unk0_7) if (a->unk0_7 < b->unk0_7)
return 0; return FALSE;
if (a->unk2 > b->unk2) if (a->unk2 > b->unk2)
return 1; return TRUE;
if (a->unk2 < b->unk2) if (a->unk2 < b->unk2)
return 0; return FALSE;
if (a->words[0] > b->words[0]) if (a->words[0] > b->words[0])
return 1; return TRUE;
if (a->words[0] < b->words[0]) if (a->words[0] < b->words[0])
return 0; return FALSE;
if (a->words[1] > b->words[1]) if (a->words[1] > b->words[1])
return 1; return TRUE;
if (a->words[1] < b->words[1]) if (a->words[1] < b->words[1])
return 0; return FALSE;
return 1; return TRUE;
} }
return Random() & 1; return Random() & 1;
} }

2
src/pokemon.c
View File

@ -70,7 +70,7 @@ EWRAM_DATA u8 gEnemyPartyCount = 0;
EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0};
EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0}; EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0};
EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0}; EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0};
EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL}; EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL, NULL};
// const rom data // const rom data
#include "data/battle_moves.h" #include "data/battle_moves.h"

29
src/record_mixing.c
View File

@ -866,28 +866,23 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
} }
else if (sp1c[i][0] == TRUE && sp1c[i][1] == TRUE) else if (sp1c[i][0] == TRUE && sp1c[i][1] == TRUE)
{ {
u32 var1, var2; u8 mail1, mail2;
sp24[j][0] = i; sp24[j][0] = i;
var1 = sub_80E7A9C(&_src->mail[0]); mail1 = sub_80E7A9C(&_src->mail[0]);
var2 = sub_80E7A9C(&_src->mail[1]); mail2 = sub_80E7A9C(&_src->mail[1]);
if (!var1 && var2) if (!(mail1 || mail2) || (mail1 && mail2)) //Logical (not bitwise) XOR. Should be ((mail1 || mail2) && !(mail1 && mail2)), but that doesn't match.
{ {
#ifndef NONMATCHING sp24[j][1] = Random2() % 2;
register u8 one asm("r0") = 1; // boo, a fakematch
sp24[j][1] = one;
#else
sp24[j][1] = 1;
#endif
} }
else if ((var1 && var2) || (!var1 && !var2)) else if (mail1 && !mail2)
{
sp24[j][1] = Random2() % 2;
}
else if (var1 && !var2)
{ {
sp24[j][1] = 0; sp24[j][1] = 0;
} }
else if (!mail1 && mail2)
{
sp24[j][1] = 1;
}
j++; j++;
} }
} }
@ -921,8 +916,8 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
} }
_src = (void *)src + which * recordSize; _src = (void *)src + which * recordSize;
memcpy(&gSaveBlock1Ptr->daycare.mons[0].mail, &_src->mail[0], sizeof(struct DayCareMail)); gSaveBlock1Ptr->daycare.mons[0].mail = _src->mail[0];
memcpy(&gSaveBlock1Ptr->daycare.mons[1].mail, &_src->mail[1], sizeof(struct DayCareMail)); gSaveBlock1Ptr->daycare.mons[1].mail = _src->mail[1];
SeedRng(oldSeed); SeedRng(oldSeed);
} }