diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-16 18:01:33 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-16 18:01:33 -0400 |
| commit | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (patch) | |
| tree | 75d0853ce38e31116d4c1ab031bdb80256133983 /src/pokemon_2.c | |
| parent | 244ef10a3ffb2f9f00526cca37cee354c5cc5b3f (diff) | |
Decompile remaining Pokemon data into c objects
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 7fbfc1271..8301ca39f 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -42,7 +42,7 @@ extern const struct SpriteTemplate gSpriteTemplate_8208288[]; //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.) extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; -extern u8 gSecretBaseTrainerClasses[]; +extern u8 gSecretBaseTrainerClasses[][5]; extern u8 gUnknown_08208238[]; extern u8 gUnknown_0820823C[]; extern u8 gStatStageRatios[][2]; @@ -1191,13 +1191,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]; } |