diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-05 22:31:01 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 10:38:28 +0800 |
| commit | f9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch) | |
| tree | ee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/secret_base.c | |
| parent | 405f1bb529809b8169364737087189df0fcca1d2 (diff) | |
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 78e6bd7d0..4bf1709d2 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -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 ++; } |