diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-09 23:40:42 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-09 23:40:42 -0700 |
| commit | 59c69882dc3a61ae93b85a880d9f8a08cbf13a3f (patch) | |
| tree | 6e7a3913f0664e1a3f302a4a7b5bf67e221a1b77 /src/pokemon_2.c | |
| parent | 70615f7eef8813d41f9ae94916aed358d23174a0 (diff) | |
rename pokemon functions
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index e3f93645a..9f9fc3911 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -9,7 +9,7 @@ extern u8 gBadEggNickname[]; extern u8 gEggNickname[]; extern u32 gBitTable[]; -void EncryptMon(struct BoxPokemon *boxMon) +void EncryptBoxMon(struct BoxPokemon *boxMon) { u32 i; for (i = 0; i < 12; i++) @@ -19,7 +19,7 @@ void EncryptMon(struct BoxPokemon *boxMon) } } -void DecryptMon(struct BoxPokemon *boxMon) +void DecryptBoxMon(struct BoxPokemon *boxMon) { u32 i; for (i = 0; i < 12; i++) @@ -133,11 +133,11 @@ u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data) case MON_DATA_64: return mon->pokerus; default: - return GetMonBoxData(&mon->box, field, data); + return GetBoxMonData(&mon->box, field, data); } } -u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data) +u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) { u32 retVal = 0; struct PokemonSubstruct0 *substruct0 = NULL; @@ -152,9 +152,9 @@ u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data) substruct2 = &(GetSubstruct(boxMon, boxMon->personality, 2)->type2); substruct3 = &(GetSubstruct(boxMon, boxMon->personality, 3)->type3); - DecryptMon(boxMon); + DecryptBoxMon(boxMon); - if (pokemon_calc_checksum(boxMon) != boxMon->checksum) + if (CalculateBoxMonChecksum(boxMon) != boxMon->checksum) { boxMon->isBadEgg = 1; boxMon->sanity3 = 1; @@ -468,7 +468,7 @@ u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data) } if (field > MON_DATA_10) - EncryptMon(boxMon); + EncryptBoxMon(boxMon); return retVal; } |