Pikachu Habitats + U-Turn TM Fix + Build Script Warning

-The build script will warn you if you're using Python 3.8 or higher.
This commit is contained in:
Skeli 2020-03-26 19:14:09 +02:00
parent 7409555e1a
commit de580b83f2
3 changed files with 79 additions and 4 deletions

View File

@ -386,6 +386,9 @@ def main():
'**/*.mid': ProcessMusic,
}
if sys.version_info.major >= 3 and sys.version_info.minor >= 8:
print("Warning! Python 3.8 may not be able to build this engine.\nPlease downgrade to Python 3.7.4")
# Create output directory
try:
os.makedirs(BUILD)

View File

@ -446,6 +446,41 @@ const u16 gForestPage8[] =
SPECIES_PICHU_SPIKY
};
const u16 gForestPage8_1[] =
{
SPECIES_PIKACHU_SURFING,
SPECIES_PIKACHU_FLYING,
};
const u16 gForestPage8_2[] =
{
SPECIES_PIKACHU_COSPLAY,
SPECIES_PIKACHU_LIBRE,
SPECIES_PIKACHU_POP_STAR,
};
const u16 gForestPage8_3[] =
{
SPECIES_PIKACHU_ROCK_STAR,
SPECIES_PIKACHU_BELLE,
SPECIES_PIKACHU_PHD,
};
const u16 gForestPage8_4[] =
{
SPECIES_PIKACHU_CAP_ORIGINAL,
SPECIES_PIKACHU_CAP_HOENN,
SPECIES_PIKACHU_CAP_SINNOH,
SPECIES_PIKACHU_CAP_UNOVA,
};
const u16 gForestPage8_5[] =
{
SPECIES_PIKACHU_CAP_KALOS,
SPECIES_PIKACHU_CAP_ALOLA,
SPECIES_PIKACHU_CAP_PARTNER,
};
const u16 gForestPage9[] =
{
SPECIES_BELLSPROUT,
@ -2324,6 +2359,11 @@ const struct HabitatPage gForestPages[] =
{gForestPage6, ARRAY_COUNT(gForestPage6)},
{gForestPage7, ARRAY_COUNT(gForestPage7)},
{gForestPage8, ARRAY_COUNT(gForestPage8)},
{gForestPage8_1, ARRAY_COUNT(gForestPage8_1)},
{gForestPage8_2, ARRAY_COUNT(gForestPage8_2)},
{gForestPage8_3, ARRAY_COUNT(gForestPage8_3)},
{gForestPage8_4, ARRAY_COUNT(gForestPage8_4)},
{gForestPage8_5, ARRAY_COUNT(gForestPage8_5)},
{gForestPage9, ARRAY_COUNT(gForestPage9)},
{gForestPage10, ARRAY_COUNT(gForestPage10)},
{gForestPage11, ARRAY_COUNT(gForestPage11)},

View File

@ -15,6 +15,7 @@ GOLBAT
VENOMOTH
MEOWTH
MEOWTH_A
MEOWTH_G
PERSIAN
PERSIAN_A
MANKEY
@ -40,6 +41,7 @@ YANMA
GLIGAR
SCIZOR
CELEBI
BLAZIKEN
BEAUTIFLY
DUSTOX
TAILLOW
@ -63,6 +65,7 @@ MOTHIM
VESPIQUEN
PACHIRISU
AMBIPOM
LOPUNNY
GLAMEOW
PURUGLY
CHATOT
@ -86,8 +89,9 @@ WOOBAT
SWOOBAT
WHIMSICOTT
DARUMAKA
DARUMAKA_G
DARMANITAN
DARMANITANZEN
DARMANITAN_G
ARCHEN
ARCHEOPS
ZORUA
@ -95,6 +99,7 @@ ZOROARK
MINCCINO
CINCCINO
EMOLGA
EELEKTRIK
EELEKTROSS
ACCELGOR
MIENFOO
@ -122,7 +127,6 @@ GENESECT_DOUSE
FROAKIE
FROGADIER
GRENINJA
ASHGRENINJA
BUNNELBY
DIGGERSBY
FLETCHLING
@ -148,6 +152,16 @@ VIVILLON_SAVANNA
VIVILLON_SUN
VIVILLON_TUNDRA
VIVILLON_FANCY
FURFROU
FURFROU_HEART
FURFROU_DIAMOND
FURFROU_STAR
FURFROU_PHAROAH
FURFROU_KABUKI
FURFROU_LA_REINE
FURFROU_MATRON
FURFROU_DANDY
FURFROU_DEBUTANTE
CLAUNCHER
CLAWITZER
HELIOPTILE
@ -173,7 +187,6 @@ ORICORIO_S
CUTIEFLY
RIBOMBEE
WISHIWASHI
WISHIWASHI_S
TSAREENA
COMFEY
PASSIMIAN
@ -208,4 +221,23 @@ KOMALA
TOGEDEMARU
TAPU_KOKO
PHEROMOSA
NAGANADEL
NAGANADEL
GROOKEY
THWACKEY
RILLABOOM
SCORBUNNY
RABOOT
CINDERACE
SOBBLE
DRIZZILE
INTELEON
ROOKIDEE
CORVISQUIRE
CORVIKNIGHT
ORBEETLE
THIEVUL
FLAPPLE
PERRSERKER
FROSMOTH
DRAKLOAK
DRAGAPULT