diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-03 22:58:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 22:58:47 -0400 |
| commit | 86a4a2cd3b7cda3b1885e53e7c9ac4d31270bd6c (patch) | |
| tree | 5b3c87ca05d93264a7a3e62347a571299ce90795 /src/pokemon_2.c | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
| parent | d8bfc0998dec654e908caddccf8147ea62c0ea4a (diff) | |
Merge pull request #328 from PikalaxALT/pokemon_data
Pokémon data
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 5acdae4d3..543b032e2 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -38,7 +38,12 @@ extern struct PokemonStorage gPokemonStorage; extern u8 gBadEggNickname[]; extern const struct SpriteTemplate gSpriteTemplate_8208288[]; //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.) -extern u8 gSecretBaseTrainerClasses[]; +extern u8 gTrainerClassToPicIndex[]; +extern u8 gTrainerClassToNameIndex[]; +extern u8 gSecretBaseTrainerClasses[][5]; +extern u8 gUnknown_08208238[]; +extern u8 gUnknown_0820823C[]; +extern u8 gStatStageRatios[][2]; extern u8 gHoldEffectToType[][2]; u8 CountAliveMons(u8 a1) @@ -1184,13 +1189,13 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord) u8 GetSecretBaseTrainerPicIndex(void) { - u8 trainerClass = gSecretBaseTrainerClasses[(gSecretBaseRecord.trainerId[0] % 5) + (5 * gSecretBaseRecord.gender)]; + u8 trainerClass = gSecretBaseTrainerClasses[gSecretBaseRecord.gender][gSecretBaseRecord.trainerId[0] % 5]; return gTrainerClassToPicIndex[trainerClass]; } u8 GetSecretBaseTrainerNameIndex(void) { - u8 trainerClass = gSecretBaseTrainerClasses[(gSecretBaseRecord.trainerId[0] % 5) + (5 * gSecretBaseRecord.gender)]; + u8 trainerClass = gSecretBaseTrainerClasses[gSecretBaseRecord.gender][gSecretBaseRecord.trainerId[0] % 5]; return gTrainerClassToNameIndex[trainerClass]; } |