atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review changes.

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-08 21:02:34 -03:00
parent 09a5d6c722
commit 35d5324324
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/battle_string_ids.h
View file

@ -549,7 +549,7 @@
#define STRINGID_NOONEWILLBEABLETORUNAWAY 545
#define STRINGID_DESTINYKNOTACTIVATES 546
#define STRINGID_CLOAKEDINAFREEZINGLIGHT 547
#define STRINGID_FERVENTWISHREACHED 548
#define STRINGID_FERVENTWISHREACHED 548
#define BATTLESTRINGS_COUNT 549

2
include/constants/pokemon.h
View file

@ -294,7 +294,7 @@
// Evolution types
#define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
#define EVO_WISH_MEGA_EVOLUTION 0xfffe // Not an actual evolution, used to temporarily mega evolve in battle.
#define EVO_WISH_MEGA_EVOLUTION 0xfffe // Mega Evolution that checks for a move instead of held item.
#define EVO_FRIENDSHIP 1 // Pokémon levels up with friendship ≥ 220
#define EVO_FRIENDSHIP_DAY 2 // Pokémon levels up during the day with friendship ≥ 220
#define EVO_FRIENDSHIP_NIGHT 3 // Pokémon levels up at night with friendship ≥ 220

1
src/battle_util.c
View file

@ -7506,7 +7506,6 @@ u16 GetWishMegaEvolutionSpecies(u16 preEvoSpecies, u16 moveId1, u16 moveId2, u16
bool32 CanMegaEvolve(u8 battlerId)
{
u8 i;
u32 itemId, holdEffect, species;
struct Pokemon *mon;
u8 battlerPosition = GetBattlerPosition(battlerId);