diff --git a/include/regions.h b/include/regions.h index 2f44896ea..2646835f9 100644 --- a/include/regions.h +++ b/include/regions.h @@ -6,7 +6,7 @@ static inline u32 GetCurrentRegion(void) { // TODO: Since there's no current multi-region support, we have this constant for the purposes of regional form comparisons. - return REGION_HOENN; + return REGION_KANTO; } #endif // GUARD_REGIONS_H diff --git a/src/daycare.c b/src/daycare.c index 713fe4d1d..2991d8fa5 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1232,6 +1232,8 @@ static void GiveMoveIfItem(struct Pokemon *mon, struct DayCare *daycare) } } +STATIC_ASSERT(P_SCATTERBUG_LINE_FORM_BREED == SPECIES_SCATTERBUG_ICY_SNOW || (P_SCATTERBUG_LINE_FORM_BREED >= SPECIES_SCATTERBUG_POLAR && P_SCATTERBUG_LINE_FORM_BREED <= SPECIES_SCATTERBUG_POKEBALL), ScatterbugLineFormBreedMustBeAValidScatterbugForm); + static u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots) { u32 i;