From 7d42f9386151eabd2b471f591b28b55a519dbb62 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 5 May 2022 11:55:31 -0700 Subject: [PATCH 1/8] added special overworld evo changes --- asm/macros/event.inc | 9 +++++++++ include/constants/pokemon.h | 12 +++++++---- src/data/pokemon/evolution.h | 6 +++--- src/pokemon.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 661e675c97..9d99d0432f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1939,3 +1939,12 @@ setvar VAR_0x8006, \item special CreateEventLegalEnemyMon .endm + + @ Attempts to trigger a special evolution method. + @ 'evoMethod' is the evolution you want to trigger. + @ There may be other conditions required which are coded for in GetEvolutionTargetSpecies. + @ EX: tryspecialevo EVO_WATER_SCROLL will trigger an evolution for Kubfu. + .macro tryspecialevo evoMethod:req + setvar VAR_0x8000, \evoMethod + special TrySpecialOverworldEvo + .endm \ No newline at end of file diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index ba9495158a..2c2c98987d 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -352,14 +352,18 @@ #define EVO_SPECIFIC_MAP 32 // Pokémon levels up on specified map #define EVO_LEVEL_NATURE_AMPED 33 // Pokémon reaches the specified level, it has a Hardy, Brave, Adamant, Naughty, Docile, Impish, Lax, Hasty, Jolly, Naive, Rash, Sassy, or Quirky nature. #define EVO_LEVEL_NATURE_LOW_KEY 34 // Pokémon reaches the specified level, it has a Lonely, Bold, Relaxed, Timid, Serious, Modest, Mild, Quiet, Bashful, Calm, Gentle, or Careful nature. +#define EVO_SCRIPT_TRIGGER_DMG 35 // Pokémon has specified HP below max, then player interacts trigger +#define EVO_DARK_SCROLL 36 // interacts with Scroll of Darkness +#define EVO_WATER_SCROLL 37 // interacts with Scroll of Waters #define EVOS_PER_MON 10 // Evolution 'modes,' for GetEvolutionTargetSpecies -#define EVO_MODE_NORMAL 0 -#define EVO_MODE_TRADE 1 -#define EVO_MODE_ITEM_USE 2 -#define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +#define EVO_MODE_NORMAL 0 +#define EVO_MODE_TRADE 1 +#define EVO_MODE_ITEM_USE 2 +#define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +#define EVO_MODE_OVERWORLD_SPECIAL 4 // Form change types #define FORM_CHANGE_END 0 diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index b431b88a3b..475e7fc911 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -493,8 +493,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CUFANT] = {{EVO_LEVEL, 34, SPECIES_COPPERAJAH}}, [SPECIES_DREEPY] = {{EVO_LEVEL, 50, SPECIES_DRAKLOAK}}, [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT}}, - [SPECIES_KUBFU] = {{EVO_LEVEL, 0, SPECIES_URSHIFU}, - {EVO_LEVEL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, + [SPECIES_KUBFU] = {{EVO_DARK_SCROLL, 0, SPECIES_URSHIFU}, + {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}}, [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, [SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}}, @@ -513,7 +513,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, [SPECIES_LINOONE_GALARIAN] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}}, [SPECIES_DARUMAKA_GALARIAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN}}, - [SPECIES_YAMASK_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_RUNERIGUS}}, + [SPECIES_YAMASK_GALARIAN] = {{EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}}, [SPECIES_BURMY_SANDY_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}}, [SPECIES_BURMY_TRASH_CLOAK] = {{EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, diff --git a/src/pokemon.c b/src/pokemon.c index 5b40275035..05047caec7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6755,6 +6755,28 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; + // Overworld evolution without leveling; evolution method is being passed into the evolutionItem arg. + case EVO_MODE_OVERWORLD_SPECIAL: + for (i = 0; i < EVOS_PER_MON; i++) + { + switch (gEvolutionTable[species][i].method) + { + case EVO_SCRIPT_TRIGGER_DMG: + if (evolutionItem == EVO_SCRIPT_TRIGGER_DMG + && (GetMonData(mon, MON_DATA_MAX_HP, NULL) - GetMonData(mon, MON_DATA_HP, NULL) >= gEvolutionTable[species][i].param)) + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; + case EVO_DARK_SCROLL: + if (evolutionItem == EVO_DARK_SCROLL) + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; + case EVO_WATER_SCROLL: + if (evolutionItem == EVO_WATER_SCROLL) + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; + } + } + break; } return targetSpecies; @@ -8431,3 +8453,20 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) ivs[j++] = temp[i]; } } + +// Attempts to perform non-level/item related overworld evolutions; called by tryspecialevo command. +void TrySpecialOverworldEvo(void) +{ + u8 i; + u8 evoMethod = gSpecialVar_0x8000; + + for (i = 0; i < PARTY_SIZE; i++) + { + u16 targetSpecies = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_OVERWORLD_SPECIAL, evoMethod, SPECIES_NONE); + if (targetSpecies != SPECIES_NONE) + { + gCB2_AfterEvolution = CB2_ReturnToField; + BeginEvolutionScene(&gPlayerParty[i], targetSpecies, TRUE, i); + } + } +} From 616e26121ffa51f3737ca3ce06565700fdb6a929 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 5 May 2022 12:02:34 -0700 Subject: [PATCH 2/8] added new line --- asm/macros/event.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 9d99d0432f..2bdfc55672 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1947,4 +1947,4 @@ .macro tryspecialevo evoMethod:req setvar VAR_0x8000, \evoMethod special TrySpecialOverworldEvo - .endm \ No newline at end of file + .endm From 03c48b4f3f0998dbe3fc03789d26abe8df6d2f9b Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 5 May 2022 15:46:53 -0700 Subject: [PATCH 3/8] compatibility with evo_battle --- include/constants/pokemon.h | 8 ++++---- src/data/pokemon/evolution.h | 6 +++++- src/pokemon.c | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 2c2c98987d..f4fa1f8003 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -352,9 +352,9 @@ #define EVO_SPECIFIC_MAP 32 // Pokémon levels up on specified map #define EVO_LEVEL_NATURE_AMPED 33 // Pokémon reaches the specified level, it has a Hardy, Brave, Adamant, Naughty, Docile, Impish, Lax, Hasty, Jolly, Naive, Rash, Sassy, or Quirky nature. #define EVO_LEVEL_NATURE_LOW_KEY 34 // Pokémon reaches the specified level, it has a Lonely, Bold, Relaxed, Timid, Serious, Modest, Mild, Quiet, Bashful, Calm, Gentle, or Careful nature. -#define EVO_SCRIPT_TRIGGER_DMG 35 // Pokémon has specified HP below max, then player interacts trigger -#define EVO_DARK_SCROLL 36 // interacts with Scroll of Darkness -#define EVO_WATER_SCROLL 37 // interacts with Scroll of Waters +#define EVO_SCRIPT_TRIGGER_DMG 36 // Pokémon has specified HP below max, then player interacts trigger +#define EVO_DARK_SCROLL 37 // interacts with Scroll of Darkness +#define EVO_WATER_SCROLL 38 // interacts with Scroll of Waters #define EVOS_PER_MON 10 @@ -363,7 +363,7 @@ #define EVO_MODE_TRADE 1 #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve -#define EVO_MODE_OVERWORLD_SPECIAL 4 +#define EVO_MODE_OVERWORLD_SPECIAL 5 // Form change types #define FORM_CHANGE_END 0 diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 475e7fc911..d38b54074a 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -507,7 +507,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_NONE, SPECIES_SLOWKING_GALARIAN}}, - [SPECIES_FARFETCHD_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_SIRFETCHD}}, + #ifdef BATTLE_ENGINE + [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, + #else + [SPECIES_FARFETCHD_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_SIRFETCHD}}, + #endif [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, diff --git a/src/pokemon.c b/src/pokemon.c index 05047caec7..abb7f7e049 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6755,6 +6755,21 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; + #ifdef BATTLE_ENGINE + // Battle evolution without leveling; party slot is being passed into the evolutionItem arg. + case EVO_MODE_BATTLE_SPECIAL: + for (i = 0; i < EVOS_PER_MON; i++) + { + switch (gEvolutionTable[species][i].method) + { + case EVO_CRITICAL_HITS: + if (gPartyCriticalHits[evolutionItem] >= gEvolutionTable[species][i].param) + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; + } + } + break; + #endif // Overworld evolution without leveling; evolution method is being passed into the evolutionItem arg. case EVO_MODE_OVERWORLD_SPECIAL: for (i = 0; i < EVOS_PER_MON; i++) From 8a0a2a5a39832010d3182ffa135e60a31df8fe0f Mon Sep 17 00:00:00 2001 From: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> Date: Sat, 7 May 2022 09:36:03 -0700 Subject: [PATCH 4/8] Apply suggestions from code review Co-authored-by: Eduardo Quezada D'Ottone --- include/constants/pokemon.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index f4fa1f8003..bd5fe81511 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -352,6 +352,7 @@ #define EVO_SPECIFIC_MAP 32 // Pokémon levels up on specified map #define EVO_LEVEL_NATURE_AMPED 33 // Pokémon reaches the specified level, it has a Hardy, Brave, Adamant, Naughty, Docile, Impish, Lax, Hasty, Jolly, Naive, Rash, Sassy, or Quirky nature. #define EVO_LEVEL_NATURE_LOW_KEY 34 // Pokémon reaches the specified level, it has a Lonely, Bold, Relaxed, Timid, Serious, Modest, Mild, Quiet, Bashful, Calm, Gentle, or Careful nature. +#define EVO_CRITICAL_HITS 35 // Pokémon performs specified number of critical hits in one battle #define EVO_SCRIPT_TRIGGER_DMG 36 // Pokémon has specified HP below max, then player interacts trigger #define EVO_DARK_SCROLL 37 // interacts with Scroll of Darkness #define EVO_WATER_SCROLL 38 // interacts with Scroll of Waters @@ -363,6 +364,7 @@ #define EVO_MODE_TRADE 1 #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +#define EVO_MODE_BATTLE_SPECIAL 4 #define EVO_MODE_OVERWORLD_SPECIAL 5 // Form change types From 54163240d89431f9c5da9b57e948a3d6f9faf2ad Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sun, 8 May 2022 20:55:29 -0700 Subject: [PATCH 5/8] implemented toggelable cancellation / multi-evo --- asm/macros/event.inc | 11 +++++---- data/specials.inc | 1 + src/data/pokemon/evolution.h | 6 +---- src/data/pokemon/level_up_learnsets.h | 1 - src/pokemon.c | 33 +++++++++++++++++++++++---- 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 2bdfc55672..a2d974fbeb 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1940,11 +1940,14 @@ special CreateEventLegalEnemyMon .endm - @ Attempts to trigger a special evolution method. - @ 'evoMethod' is the evolution you want to trigger. + @ Attempts to trigger a special evolution method in the overworld. @ There may be other conditions required which are coded for in GetEvolutionTargetSpecies. - @ EX: tryspecialevo EVO_WATER_SCROLL will trigger an evolution for Kubfu. - .macro tryspecialevo evoMethod:req + @ EX: tryspecialevo EVO_WATER_SCROLL, FALSE, FALSE triggers Kubfu's EVO_WATER_SCROLL evolution + @ method, cannot be cancelled in the evolution scene, and will only evolve one Kubfu if there + @ are multiple in the player's party. + .macro tryspecialevo evoMethod:req, canStopEvo=TRUE, tryMultiple=TRUE setvar VAR_0x8000, \evoMethod + setvar VAR_0x8001, \canStopEvo + setvar VAR_0x8002, \tryMultiple special TrySpecialOverworldEvo .endm diff --git a/data/specials.inc b/data/specials.inc index a863b6e137..30ad25cb4d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -535,3 +535,4 @@ gSpecials:: def_special RemoveRecordsWindow def_special CloseDeptStoreElevatorWindow def_special TrySetBattleTowerLinkType + def_special TrySpecialOverworldEvo diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index d38b54074a..aff4ff04fa 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -507,11 +507,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PONYTA_GALARIAN] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}}, [SPECIES_SLOWPOKE_GALARIAN] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_NONE, SPECIES_SLOWKING_GALARIAN}}, - #ifdef BATTLE_ENGINE - [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, - #else - [SPECIES_FARFETCHD_GALARIAN] = {{EVO_LEVEL, 0, SPECIES_SIRFETCHD}}, - #endif + [SPECIES_FARFETCHD_GALARIAN] = {{EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}}, [SPECIES_MR_MIME_GALARIAN] = {{EVO_LEVEL, 42, SPECIES_MR_RIME}}, [SPECIES_CORSOLA_GALARIAN] = {{EVO_LEVEL, 38, SPECIES_CURSOLA}}, [SPECIES_ZIGZAGOON_GALARIAN] = {{EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}}, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index c774cc3127..8df5886bd2 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -1,5 +1,4 @@ #define LEVEL_UP_MOVE(lvl, moveLearned) {.move = moveLearned, .level = lvl} -#define LEVEL_UP_END (0xffff) static const struct LevelUpMove sBulbasaurLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), diff --git a/src/pokemon.c b/src/pokemon.c index abb7f7e049..e1a391b90e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -66,6 +66,7 @@ static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); static bool8 ShouldSkipFriendshipChange(void); static u8 SendMonToPC(struct Pokemon* mon); static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv); +void TrySpecialOverworldEvo(); EWRAM_DATA static u8 sLearningMoveTableID = 0; EWRAM_DATA u8 gPlayerPartyCount = 0; @@ -74,6 +75,7 @@ EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0}; EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0}; EWRAM_DATA static struct MonSpritesGfxManager *sMonSpritesGfxManagers[MON_SPR_GFX_MANAGERS_COUNT] = {NULL}; +EWRAM_DATA static u8 sTriedEvolving = 0; #include "data/battle_moves.h" @@ -6777,10 +6779,14 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s switch (gEvolutionTable[species][i].method) { case EVO_SCRIPT_TRIGGER_DMG: - if (evolutionItem == EVO_SCRIPT_TRIGGER_DMG - && (GetMonData(mon, MON_DATA_MAX_HP, NULL) - GetMonData(mon, MON_DATA_HP, NULL) >= gEvolutionTable[species][i].param)) + { + u16 currentHp = GetMonData(mon, MON_DATA_HP, NULL); + if (evolutionItem == EVO_SCRIPT_TRIGGER_DMG + && currentHp != 0 + && (GetMonData(mon, MON_DATA_MAX_HP, NULL) - currentHp >= gEvolutionTable[species][i].param)) targetSpecies = gEvolutionTable[species][i].targetSpecies; break; + } case EVO_DARK_SCROLL: if (evolutionItem == EVO_DARK_SCROLL) targetSpecies = gEvolutionTable[species][i].targetSpecies; @@ -8469,19 +8475,36 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) } } +static void CB2_DoSpecialOverworldEvo(void) +{ + TrySpecialOverworldEvo(); +} + // Attempts to perform non-level/item related overworld evolutions; called by tryspecialevo command. void TrySpecialOverworldEvo(void) { u8 i; u8 evoMethod = gSpecialVar_0x8000; + u16 canStopEvo = gSpecialVar_0x8001; + u16 tryMultiple = gSpecialVar_0x8002; for (i = 0; i < PARTY_SIZE; i++) { u16 targetSpecies = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_OVERWORLD_SPECIAL, evoMethod, SPECIES_NONE); - if (targetSpecies != SPECIES_NONE) + if (targetSpecies != SPECIES_NONE && !(sTriedEvolving & gBitTable[i])) { - gCB2_AfterEvolution = CB2_ReturnToField; - BeginEvolutionScene(&gPlayerParty[i], targetSpecies, TRUE, i); + if (tryMultiple) + { + gCB2_AfterEvolution = CB2_DoSpecialOverworldEvo; + sTriedEvolving |= gBitTable[i]; + } + else + gCB2_AfterEvolution = CB2_ReturnToField; + BeginEvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); + return; } } + + sTriedEvolving = 0; + SetMainCallback2(CB2_ReturnToField); } From e50d5661cdf303f685738542a7e9fa1995f4daec Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sun, 8 May 2022 20:57:12 -0700 Subject: [PATCH 6/8] removed unneccesary preproc --- src/pokemon.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index e1a391b90e..bf07718413 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6757,7 +6757,6 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; - #ifdef BATTLE_ENGINE // Battle evolution without leveling; party slot is being passed into the evolutionItem arg. case EVO_MODE_BATTLE_SPECIAL: for (i = 0; i < EVOS_PER_MON; i++) @@ -6771,7 +6770,6 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; - #endif // Overworld evolution without leveling; evolution method is being passed into the evolutionItem arg. case EVO_MODE_OVERWORLD_SPECIAL: for (i = 0; i < EVOS_PER_MON; i++) From 502ce4bb33d4eafb70537f2e77cc20abe64474f1 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sun, 8 May 2022 21:16:16 -0700 Subject: [PATCH 7/8] fixed graphics bug and reverted last commit --- src/pokemon.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index bf07718413..c41b9fdb95 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6757,6 +6757,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; + #ifdef BATTLE_ENGINE // Battle evolution without leveling; party slot is being passed into the evolutionItem arg. case EVO_MODE_BATTLE_SPECIAL: for (i = 0; i < EVOS_PER_MON; i++) @@ -6770,6 +6771,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } } break; + #endif // Overworld evolution without leveling; evolution method is being passed into the evolutionItem arg. case EVO_MODE_OVERWORLD_SPECIAL: for (i = 0; i < EVOS_PER_MON; i++) @@ -8473,11 +8475,6 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) } } -static void CB2_DoSpecialOverworldEvo(void) -{ - TrySpecialOverworldEvo(); -} - // Attempts to perform non-level/item related overworld evolutions; called by tryspecialevo command. void TrySpecialOverworldEvo(void) { @@ -8491,14 +8488,15 @@ void TrySpecialOverworldEvo(void) u16 targetSpecies = GetEvolutionTargetSpecies(&gPlayerParty[i], EVO_MODE_OVERWORLD_SPECIAL, evoMethod, SPECIES_NONE); if (targetSpecies != SPECIES_NONE && !(sTriedEvolving & gBitTable[i])) { + sTriedEvolving |= gBitTable[i]; + if(gMain.callback2 == TrySpecialOverworldEvo) // This fixes small graphics glitches. + EvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); + else + BeginEvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); if (tryMultiple) - { - gCB2_AfterEvolution = CB2_DoSpecialOverworldEvo; - sTriedEvolving |= gBitTable[i]; - } + gCB2_AfterEvolution = TrySpecialOverworldEvo; else gCB2_AfterEvolution = CB2_ReturnToField; - BeginEvolutionScene(&gPlayerParty[i], targetSpecies, canStopEvo, i); return; } } From b43dfd59768c203608ef7b83f8f04ec346a34365 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 May 2022 17:04:28 -0400 Subject: [PATCH 8/8] Quick formatting --- src/pokemon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index c41b9fdb95..8735488503 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6789,12 +6789,12 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s } case EVO_DARK_SCROLL: if (evolutionItem == EVO_DARK_SCROLL) - targetSpecies = gEvolutionTable[species][i].targetSpecies; - break; + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; case EVO_WATER_SCROLL: - if (evolutionItem == EVO_WATER_SCROLL) - targetSpecies = gEvolutionTable[species][i].targetSpecies; - break; + if (evolutionItem == EVO_WATER_SCROLL) + targetSpecies = gEvolutionTable[species][i].targetSpecies; + break; } } break;