ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses

Browse Source
This commit is contained in:
garak 2019-05-15 19:56:43 -04:00 committed by huderlem
parent daecd5ec40
commit 60baf19d45
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@ -434,7 +434,7 @@ extern const u8 gPPUpGetMask[];
extern const u8 gPPUpSetMask[];
extern const u8 gPPUpAddMask[];
extern const u8 gStatStageRatios[][2];
extern const u16 gFacilityClassPicsByIndex[];
extern const u16 gLinkPlayerFacilityClasses[];
extern const struct SpriteTemplate gUnknown_08329D98[];
extern const s8 gNatureStatTable[][5];

14
src/pokemon.c
View File

@ -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)

8
src/trainer_card.c
View File

@ -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)