dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

Browse Source
This commit is contained in:
nullableVoidPtr
2018-12-05 22:31:01 +08:00
parent 405f1bb529
commit f9ff7316d5
140 changed files with 27697 additions and 23904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/secret_base.c
View File

@@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId)
return i;
}
}
return INVALID_S16;
return -1;
}
u8 sub_80EA9D8(void)
@@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language)
secretBaseRecordId = sub_80EA990(base->secretBaseId);
if (secretBaseRecordId != 0)
{
if (secretBaseRecordId != INVALID_S16)
if (secretBaseRecordId != -1)
{
if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1)
{
@@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0;
}
}
if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16)
if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF)
{
gSaveBlock1Ptr->secretBases[0].sbr_field_e ++;
}