diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:59:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:59:48 -0400 |
| commit | 1406084fdd097d81a18c666f3f632ec2bee693c7 (patch) | |
| tree | 450e671ec7a1f762dae98e51f774247586ca253a /src | |
| parent | 9884147cd95a2081c34fd9624e8837528bb5afc4 (diff) | |
More camelCase, 2
Diffstat (limited to 'src')
| -rw-r--r-- | src/secret_base.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index 690e91e6a..6ba4312b2 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -716,49 +716,49 @@ void sub_80E9914(void) { u32 zero; u32 *personality; - u16 partyidx; - u16 moveidx; - u16 sbpartyidx; + u16 partyIdx; + u16 moveIdx; + u16 sbPartyIdx; u16 *species; u16 *items; u16 *moves; u8 *levels; u8 *evs; - sbpartyidx = 0; + sbPartyIdx = 0; personality = gSaveBlock1Ptr->secretBases[0].partyPersonality; if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0) { - partyidx = 0; + partyIdx = 0; moves = gSaveBlock1Ptr->secretBases[0].partyMoves; species = gSaveBlock1Ptr->secretBases[0].partySpecies; items = gSaveBlock1Ptr->secretBases[0].partyHeldItems; levels = gSaveBlock1Ptr->secretBases[0].partyLevels; evs = gSaveBlock1Ptr->secretBases[0].partyEVs; zero = 0; - for (partyidx = 0; partyidx < PARTY_SIZE; partyidx ++) + for (partyIdx = 0; partyIdx < PARTY_SIZE; partyIdx ++) { - for (moveidx = 0; moveidx < 4; moveidx ++) + for (moveIdx = 0; moveIdx < 4; moveIdx ++) { - moves[partyidx * 4 + moveidx] = zero; + moves[partyIdx * 4 + moveIdx] = zero; } - species[partyidx] = zero; - items[partyidx] = zero; - levels[partyidx] = zero; - personality[partyidx] = zero; - evs[partyidx] = zero; - if (GetMonData(&gPlayerParty[partyidx], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[partyidx], MON_DATA_IS_EGG)) + species[partyIdx] = zero; + items[partyIdx] = zero; + levels[partyIdx] = zero; + personality[partyIdx] = zero; + evs[partyIdx] = zero; + if (GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[partyIdx], MON_DATA_IS_EGG)) { - for (moveidx = 0; moveidx < 4; moveidx ++) + for (moveIdx = 0; moveIdx < 4; moveIdx ++) { - moves[sbpartyidx * 4 + moveidx] = GetMonData(&gPlayerParty[partyidx], MON_DATA_MOVE1 + moveidx); + moves[sbPartyIdx * 4 + moveIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_MOVE1 + moveIdx); } - species[sbpartyidx] = GetMonData(&gPlayerParty[partyidx], MON_DATA_SPECIES); - items[sbpartyidx] = GetMonData(&gPlayerParty[partyidx], MON_DATA_HELD_ITEM); - levels[sbpartyidx] = GetMonData(&gPlayerParty[partyidx], MON_DATA_LEVEL); - personality[sbpartyidx] = GetMonData(&gPlayerParty[partyidx], MON_DATA_PERSONALITY); - evs[sbpartyidx] = sub_80E98AC(&gPlayerParty[partyidx]); - sbpartyidx ++; + species[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES); + items[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_HELD_ITEM); + levels[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_LEVEL); + personality[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_PERSONALITY); + evs[sbPartyIdx] = sub_80E98AC(&gPlayerParty[partyIdx]); + sbPartyIdx ++; } } } |