diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon.c | 14 | ||||
| -rwxr-xr-x | src/trainer_card.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 791475364..c54e8ad2c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1879,14 +1879,14 @@ static const u16 sDeoxysBaseStats[] = 90, // Sp.Defense }; -const u16 gFacilityClassPicsByIndex[] = +const u16 gLinkPlayerFacilityClasses[] = { FACILITY_CLASS_COOLTRAINER_M, FACILITY_CLASS_BLACK_BELT, FACILITY_CLASS_CAMPER, FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_PSYCHIC_M, FACILITY_CLASS_BUG_CATCHER, - FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F, - FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_LASS, - FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_POKEMON_BREEDER_F, - FACILITY_CLASS_BEAUTY + FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, + FACILITY_CLASS_COOLTRAINER_F, FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_LASS, FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, + FACILITY_CLASS_POKEMON_BREEDER_F, FACILITY_CLASS_BEAUTY }; static const u8 sHoldEffectToType[][2] = @@ -2711,7 +2711,7 @@ u16 sub_8068B48(void) arrId = gLinkPlayers[linkId].trainerId & 7; arrId |= gLinkPlayers[linkId].gender << 3; - return FacilityClassToPicIndex(gFacilityClassPicsByIndex[arrId]); + return FacilityClassToPicIndex(gLinkPlayerFacilityClasses[arrId]); } u16 sub_8068BB0(void) @@ -2726,7 +2726,7 @@ u16 sub_8068BB0(void) arrId = gLinkPlayers[linkId].trainerId & 7; arrId |= gLinkPlayers[linkId].gender << 3; - return gFacilityClassToTrainerClass[gFacilityClassPicsByIndex[arrId]]; + return gFacilityClassToTrainerClass[gLinkPlayerFacilityClasses[arrId]]; } void CreateObedientEnemyMon(void) diff --git a/src/trainer_card.c b/src/trainer_card.c index f2c389b3e..9c4816c42 100755 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -733,9 +733,9 @@ static void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCar trainerCard->stars++; if (trainerCard->gender == FEMALE) - trainerCard->var_4F = gFacilityClassPicsByIndex[(trainerCard->trainerId % 8) + 8]; + trainerCard->var_4F = gLinkPlayerFacilityClasses[(trainerCard->trainerId % 8) + 8]; else - trainerCard->var_4F = gFacilityClassPicsByIndex[trainerCard->trainerId % 8]; + trainerCard->var_4F = gLinkPlayerFacilityClasses[trainerCard->trainerId % 8]; } void TrainerCard_GenerateCardForPlayer(struct TrainerCard *trainerCard) @@ -749,9 +749,9 @@ void TrainerCard_GenerateCardForPlayer(struct TrainerCard *trainerCard) trainerCard->stars++; if (trainerCard->gender == FEMALE) - trainerCard->var_4F = gFacilityClassPicsByIndex[(trainerCard->trainerId % 8) + 8]; + trainerCard->var_4F = gLinkPlayerFacilityClasses[(trainerCard->trainerId % 8) + 8]; else - trainerCard->var_4F = gFacilityClassPicsByIndex[trainerCard->trainerId % 8]; + trainerCard->var_4F = gLinkPlayerFacilityClasses[trainerCard->trainerId % 8]; } void CopyTrainerCardData(struct TrainerCard *dst, u16 *src, u8 gameVersion) |