Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gen 8 EXP Candies #2142

Merged
merged 19 commits into from
Aug 26, 2022
Merged

Gen 8 EXP Candies #2142

merged 19 commits into from
Aug 26, 2022

Conversation

AgustinGDLV
Copy link
Collaborator

@AgustinGDLV AgustinGDLV commented May 16, 2022

Consolidates EXP Candies with Rare Candies, with holdEffectParam used to distinguish them.

EXP Candy

Discord Contact Info

Agustin#1522

@AgustinGDLV AgustinGDLV changed the title Implemented EXP Candies Gen 8 EXP Candies May 16, 2022
@AsparagusEduardo
Copy link
Collaborator

What happened to all the moves that it would have learned between levels 8 and 24?

@AgustinGDLV
Copy link
Collaborator Author

AgustinGDLV commented May 16, 2022

What happened to all the moves that it would have learned between levels 8 and 24?

Resolved!

src/data/items.h Outdated Show resolved Hide resolved
src/party_menu.c Outdated Show resolved Hide resolved
src/party_menu.c Outdated Show resolved Hide resolved
src/party_menu.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
src/strings.c Outdated Show resolved Hide resolved
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
@AgustinGDLV AgustinGDLV requested a review from LOuroboros May 16, 2022 23:33
src/pokemon.c Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
src/pokemon.c Outdated Show resolved Hide resolved
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
@Jaizu
Copy link

Jaizu commented Jul 14, 2022

Spherical Ice pointed out that this defines should have some parentheses
image

src/pokemon.c Outdated
@@ -4885,15 +4885,15 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
if (param == 0xFF) // Rare Candy
{
dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1];
SetMonData(mon, MON_DATA_EXP, &dataUnsigned);
CalculateMonStats(mon);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you move this so it only sets the EXP with Rare Candies and not Exp. candies?

src/pokemon.c Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo changed the base branch from item_expansion to master August 24, 2022 04:51
src/pokemon.c Outdated Show resolved Hide resolved
src/party_menu.c Outdated Show resolved Hide resolved
src/pokemon.c Outdated Show resolved Hide resolved
include/constants/items.h Outdated Show resolved Hide resolved
src/data/items.h Outdated Show resolved Hide resolved
src/data/items.h Outdated Show resolved Hide resolved
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
src/pokemon.c Outdated Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo merged commit 399a0c9 into rh-hideout:master Aug 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants