dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1928 from kittenchilly/friendship

Browse Source 
Add friendship evo threshold constant
This commit is contained in:
GriffinR
2023-10-01 11:53:03 -04:00
committed by GitHub
parent 3eb1fa6fcb cc30dc06d5
commit 3ff27bdae0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pokemon.c
View File

@@ -48,11 +48,13 @@
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/union_room.h" #include "constants/union_room.h"
#define DAY_EVO_HOUR_BEGIN 12 #define DAY_EVO_HOUR_BEGIN 12
#define DAY_EVO_HOUR_END HOURS_PER_DAY #define DAY_EVO_HOUR_END HOURS_PER_DAY
#define NIGHT_EVO_HOUR_BEGIN 0 #define NIGHT_EVO_HOUR_BEGIN 0
#define NIGHT_EVO_HOUR_END 12 #define NIGHT_EVO_HOUR_END 12
#define FRIENDSHIP_EVO_THRESHOLD 220
struct SpeciesItem struct SpeciesItem
{ {
@@ -5499,17 +5501,17 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem)
switch (gEvolutionTable[species][i].method) switch (gEvolutionTable[species][i].method)
{ {
case EVO_FRIENDSHIP: case EVO_FRIENDSHIP:
if (friendship >= 220) if (friendship >= FRIENDSHIP_EVO_THRESHOLD)
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
break; break;
case EVO_FRIENDSHIP_DAY: case EVO_FRIENDSHIP_DAY:
RtcCalcLocalTime(); RtcCalcLocalTime();
if (gLocalTime.hours >= DAY_EVO_HOUR_BEGIN && gLocalTime.hours < DAY_EVO_HOUR_END && friendship >= 220) if (gLocalTime.hours >= DAY_EVO_HOUR_BEGIN && gLocalTime.hours < DAY_EVO_HOUR_END && friendship >= FRIENDSHIP_EVO_THRESHOLD)
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
break; break;
case EVO_FRIENDSHIP_NIGHT: case EVO_FRIENDSHIP_NIGHT:
RtcCalcLocalTime(); RtcCalcLocalTime();
if (gLocalTime.hours >= NIGHT_EVO_HOUR_BEGIN && gLocalTime.hours < NIGHT_EVO_HOUR_END && friendship >= 220) if (gLocalTime.hours >= NIGHT_EVO_HOUR_BEGIN && gLocalTime.hours < NIGHT_EVO_HOUR_END && friendship >= FRIENDSHIP_EVO_THRESHOLD)
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
break; break;
case EVO_LEVEL: case EVO_LEVEL: