diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:48:56 -0500 |
| commit | 6280a3786ba77956fae95bb11b425e7301d0a6fa (patch) | |
| tree | b140b92b4bd9113d0dea6c6ed8197ace1f93f8fe /src/field_specials.c | |
| parent | 47f6e9f97396d1486fe515b8a994bbc285060419 (diff) | |
| parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
Merge branch 'master' into doc-sixisland
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 7f648f32b..46b560a94 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -165,7 +165,7 @@ void Special_SetHiddenItemFlag(void) FlagSet(gSpecialVar_0x8004); } -u8 Special_GetLeadMonFriendship(void) +u8 GetLeadMonFriendship(void) { struct Pokemon * pokemon = &gPlayerParty[GetLeadMonIndex()]; if (GetMonData(pokemon, MON_DATA_FRIENDSHIP) == 255) @@ -672,10 +672,10 @@ void IncrementResortGorgeousStepCounter(void) } } -void Special_SampleResortGorgeousMonAndReward(void) +void SampleResortGorgeousMonAndReward(void) { - u16 var4036 = VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON); - if (var4036 == SPECIES_NONE || var4036 == 0xFFFF) + u16 requestedSpecies = VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON); + if (requestedSpecies == SPECIES_NONE || requestedSpecies == 0xFFFF) { VarSet(VAR_RESORT_GORGEOUS_REQUESTED_MON, SampleResortGorgeousMon()); VarSet(VAR_RESORT_GORGEOUS_REWARD, SampleResortGorgeousReward()); @@ -1695,7 +1695,7 @@ void Special_UpdateTrainerCardPhotoIcons(void) VarSet(VAR_TRAINER_CARD_MON_ICON_TINT_IDX, gSpecialVar_0x8004); } -u16 Special_StickerLadyGetBragFlags(void) +u16 StickerManGetBragFlags(void) { u16 result = 0; u32 numEggs; @@ -2458,14 +2458,15 @@ void Special_BrailleCursorToggle(void) } } -bool8 Special_PlayerPartyContainsSpeciesWithPlayerID(void) +bool8 PlayerPartyContainsSpeciesWithPlayerID(void) { // 8004 = species u8 playerCount = CalculatePlayerPartyCount(); u8 i; for (i = 0; i < playerCount; i++) { - if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == gSpecialVar_0x8004 && GetPlayerTrainerId() == GetMonData(&gPlayerParty[i], MON_DATA_OT_ID, NULL)) + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == gSpecialVar_0x8004 + && GetPlayerTrainerId() == GetMonData(&gPlayerParty[i], MON_DATA_OT_ID, NULL)) return TRUE; } return FALSE; |