From 7936c6dc4c4555d46ef12a7bfdd3efb660612ee6 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 15 Sep 2023 01:03:00 -0400 Subject: [PATCH] Document wurmple evolution rand value --- include/pokemon_3.h | 2 +- src/luminous_cave.c | 2 +- src/pokemon_3.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/pokemon_3.h b/include/pokemon_3.h index 17931c9b1..50a4d1e2a 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -8,7 +8,7 @@ typedef struct EvolveStatus { /* 0x0 */ u8 evoItem1; /* 0x1 */ u8 evoItem2; - /* 0x2 */ u8 unk6; + /* 0x2 */ u8 wurmpleVal; /* 0x4 */ u16 evolutionConditionStatus; /* 0x6 */ s16 targetEvolveSpecies; } EvolveStatus; diff --git a/src/luminous_cave.c b/src/luminous_cave.c index be978c125..56df9414b 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -726,7 +726,7 @@ static void sub_8025254(void) sLuminousCaveWork->evolveStatus.evoItem2 = gTeamInventoryRef->teamItems[sLuminousCaveWork->evoItem2_InvIndex].id; } - sLuminousCaveWork->evolveStatus.unk6 = RandInt(0xFF); + sLuminousCaveWork->evolveStatus.wurmpleVal = RandInt(0xFF); sub_808F468(sLuminousCaveWork->pokeStruct, &sLuminousCaveWork->evolveStatus, 1); } diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 1a88445ce..21ce326d1 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1048,12 +1048,12 @@ void sub_808F468(PokemonStruct1 *param_1, EvolveStatus *evolveStatus, u8 param_3 continue; } } - else if (evolveConditions.evolutionRequirements.additionalRequirement == 0xb) { - if ((evolveStatus->unk6 & 1) == 0) goto _0808F6CA; + else if (evolveConditions.evolutionRequirements.additionalRequirement == 11) { + if (!(evolveStatus->wurmpleVal & 1)) goto _0808F6CA; else continue; } - else if (evolveConditions.evolutionRequirements.additionalRequirement == 0xc) { - if ((evolveStatus->unk6 & 1)) goto _0808F6CA; + else if (evolveConditions.evolutionRequirements.additionalRequirement == 12) { + if ((evolveStatus->wurmpleVal & 1)) goto _0808F6CA; else continue; } else if (evolveConditions.evolutionRequirements.additionalRequirement == 10) {