From 924d7464d88511865171fcfc86b59320261ae51f Mon Sep 17 00:00:00 2001 From: nicksnax Date: Mon, 16 Mar 2026 21:54:14 +0900 Subject: [PATCH] added all new mons to the include/constants/species.h; ready to merge to main branch. Make did not cause issues. --- include/constants/species.h | 194 ++++++++- pokeemerald-tools/gen-new-pokedex.py | 212 +++++----- pokeemerald-tools/new-mons_species.h | 575 +++++++++------------------ 3 files changed, 490 insertions(+), 491 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index f4bdde2cac..e308a79811 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1687,11 +1687,201 @@ #define SPECIES_TATSUGIRI_DROOPY_MEGA 1570 #define SPECIES_TATSUGIRI_STRETCHY_MEGA 1571 #define SPECIES_GLIMMORA_MEGA 1572 -#define SPECIES_CHARIATHAN 1573 +//new evo mons +#define SPECIES_ECOSAUR 1573 +#define SPECIES_TERARISAUR 1574 +#define SPECIES_SYMBISAUR 1575 +#define SPECIES_CHARIGUANA 1576 +#define SPECIES_CHARIANA 1577 +#define SPECIES_CHARIATHAN 1578 +#define SPECIES_FERRAPIN 1579 +#define SPECIES_FORTOISE 1580 +#define SPECIES_TURTILLERY 1581 +#define SPECIES_BUTTEFLARE 1582 +#define SPECIES_PYREFREE 1583 +#define SPECIES_IMPSECT 1584 +#define SPECIES_BEEBRUTE 1585 +#define SPECIES_DRONARCH 1586 +#define SPECIES_SEPISTRIKE 1587 +#define SPECIES_PIDGAERO 1588 +#define SPECIES_PIDGEOZONE 1589 +#define SPECIES_PIDGEPHYR 1590 +#define SPECIES_RATTCHET 1591 +#define SPECIES_RATTARULE 1592 +#define SPECIES_SNEEROW 1593 +#define SPECIES_ORNITHOW 1594 +#define SPECIES_NOHTYP 1595 +#define SPECIES_ADNOKANA 1596 +#define SPECIES_GOROCHU 1597 +#define SPECIES_STROMACHU 1598 +#define SPECIES_SANDSLAM 1599 +#define SPECIES_FERODILLO 1600 +#define SPECIES_NIDOREGAL 1601 +#define SPECIES_NIDOARCHY 1602 +#define SPECIES_NIDORULY 1603 +#define SPECIES_NIDOMINATE 1604 +#define SPECIES_CLEFAEFAE 1605 +#define SPECIES_CLEFANAUT 1606 +#define SPECIES_SPIRITALES 1607 +#define SPECIES_YOKAYUBI 1608 +#define SPECIES_GIGGLYHUFF 1609 +#define SPECIES_BOGGLYFUFF 1610 +#define SPECIES_POLABAT 1611 +#define SPECIES_VISIBAT 1612 +#define SPECIES_HORRIBAT 1613 +#define SPECIES_RAFFLURK 1614 +#define SPECIES_CONCORPSIA 1615 +#define SPECIES_SECTASITE 1616 +#define SPECIES_FUNGALITH 1617 +#define SPECIES_VENOMENA 1618 +#define SPECIES_VENOMENON 1619 +#define SPECIES_DUGROUPLE 1620 +#define SPECIES_UNEARTHLET 1621 +#define SPECIES_DIGLENOID 1622 +#define SPECIES_FELANKH 1623 +#define SPECIES_PATRAPHINX 1624 +#define SPECIES_GILDUCK 1625 +#define SPECIES_PLATINUPUS 1626 +#define SPECIES_GORILLASH 1627 +#define SPECIES_BONUMBELL 1628 +#define SPECIES_SINGESHA 1629 +#define SPECIES_GUARDIANCE 1630 +#define SPECIES_POLITOES 1631 +#define SPECIES_POLIWISE 1632 +#define SPECIES_POLIATH 1633 +#define SPECIES_SIMSALABIM 1634 +#define SPECIES_VOHOODU 1635 +#define SPECIES_TZARKARTZ 1636 +#define SPECIES_MACHULK 1637 +#define SPECIES_ABOMACHULK 1638 +#define SPECIES_MACHITAN 1639 +#define SPECIES_MUCKTRIBEL 1640 +#define SPECIES_CARNABELL 1641 +#define SPECIES_DEVLORA 1642 +#define SPECIES_TENTACATE 1643 +#define SPECIES_TENTABOMA 1644 +#define SPECIES_SLAGOLEM 1645 +#define SPECIES_MOLTREM 1646 +#define SPECIES_VOLCANICOL 1647 +#define SPECIES_COMBUSTANG 1648 +#define SPECIES_KNIGHTMARE 1649 +#define SPECIES_SLOWMATE 1650 +#define SPECIES_SLOWCHUM 1651 +#define SPECIES_MAGNEMELD 1652 +#define SPECIES_MAGNEMASTR 1653 +#define SPECIES_FORFOWLD 1654 +#define SPECIES_FOWLNTOM 1655 +#define SPECIES_QUADODO 1656 +#define SPECIES_DODOZEN 1657 +#define SPECIES_PRECIPED 1658 +#define SPECIES_MANATII 1659 +#define SPECIES_GUNK 1660 +#define SPECIES_SKUM 1661 +#define SPECIES_ANENEMY 1662 +#define SPECIES_GLAISHELL 1663 +#define SPECIES_GENGONE 1664 +#define SPECIES_POLTERGAST 1665 +#define SPECIES_GRIMM 1666 +#define SPECIES_PLATNIX 1667 +#define SPECIES_OBSIDIANIX 1668 +#define SPECIES_STALAGMIX 1669 +#define SPECIES_LULLOO 1670 +#define SPECIES_SOMNISOOTH 1671 +#define SPECIES_KRAKLAW 1672 +#define SPECIES_TEKLAWNO 1673 +#define SPECIES_ELECTRODES 1674 +#define SPECIES_ELECTRODEX 1675 +#define SPECIES_ELECTRODEM 1676 +#define SPECIES_EXEGGITY 1677 +#define SPECIES_EXEGGTRIC 1678 +#define SPECIES_OSSELOBBER 1679 +#define SPECIES_WRAIWRATH 1680 +#define SPECIES_CLEEVOYANT 1681 +#define SPECIES_SPIRITULEE 1682 +#define SPECIES_ENCHANCED 1683 +#define SPECIES_RADIACHAN 1684 +#define SPECIES_LICKILOLLY 1685 +#define SPECIES_LICKILATO 1686 +#define SPECIES_HEEVING 1687 +#define SPECIES_CHOHKING 1688 +#define SPECIES_RHYMARKABL 1689 +#define SPECIES_RHYLIC 1690 +#define SPECIES_RHYBORN 1691 +#define SPECIES_GOGETTEY 1692 +#define SPECIES_LUKKEY 1693 +#define SPECIES_FORTUNITEY 1694 +#define SPECIES_TANGATHER 1695 +#define SPECIES_TANGOLIATH 1696 +#define SPECIES_TANGRAPPLE 1697 +#define SPECIES_KANGAKID 1698 +#define SPECIES_KANGALLOUS 1699 +#define SPECIES_KANGARUTAL 1700 +#define SPECIES_LORDRA 1701 +#define SPECIES_PINNADRA 1702 +#define SPECIES_SEAREX 1703 +#define SPECIES_CAPRISEA 1704 +#define SPECIES_STARUS 1705 +#define SPECIES_STARWE 1706 +#define SPECIES_MR_JEST 1707 +#define SPECIES_MR_FOOL 1708 +#define SPECIES_RAZER 1709 +#define SPECIES_CLAYMOR 1710 +#define SPECIES_JYNKIES 1711 +#define SPECIES_JEEPERS 1712 +#define SPECIES_ELECTIVINE 1713 +#define SPECIES_ELECTIWIZZ 1714 +#define SPECIES_MAGMORE 1715 +#define SPECIES_MAGMOLTEN 1716 +#define SPECIES_PINSIRIOR 1717 +#define SPECIES_ABYSSIR 1718 +#define SPECIES_TAUROX 1719 +#define SPECIES_OXENFREE 1720 +#define SPECIES_HYDRADOS 1721 +#define SPECIES_DRACOSMIC 1722 +#define SPECIES_QUAZAR 1723 +#define SPECIES_LOCHLASS 1724 +#define SPECIES_NESSEA 1725 +#define SPECIES_MORPHO 1726 +#define SPECIES_METAMORPHO 1727 +#define SPECIES_RIVEON 1728 +#define SPECIES_BRINEON 1729 +#define SPECIES_PLASMEON 1730 +#define SPECIES_GALVEON 1731 +#define SPECIES_SMOLDEON 1732 +#define SPECIES_INFERNEON 1733 +#define SPECIES_PORYGONX 1734 +#define SPECIES_PORYGONQ 1735 +#define SPECIES_PORYGON2A4 1736 +#define SPECIES_OMAPAL 1737 +#define SPECIES_OMAGUS 1738 +#define SPECIES_KABUTAK 1739 +#define SPECIES_KABUSTION 1740 +#define SPECIES_MANDILUFT 1741 +#define SPECIES_AMBALITHIC 1742 +#define SPECIES_ACTLAX 1743 +#define SPECIES_GRIZZLAX 1744 +#define SPECIES_SNOWONE 1745 +#define SPECIES_FROSTUNUS 1746 +#define SPECIES_SHOCKATOO 1747 +#define SPECIES_VOLTDUO 1748 +#define SPECIES_IGNITHREE 1749 +#define SPECIES_INFERNTRI 1750 +#define SPECIES_DRAGONIER 1751 +#define SPECIES_DRAGONACE 1752 +#define SPECIES_DRAGONTALE 1753 +#define SPECIES_MEWTHREE 1754 +#define SPECIES_MEWFOUR 1755 +#define SPECIES_NYU 1756 +#define SPECIES_IOTA 1757 +#define SPECIES_MISSINGNO1 1758 +#define SPECIES_MISSINGNO2 1759 +#define SPECIES_MISSINGNO3 1760 +#define SPECIES_MISSINGNO4 1761 +#define SPECIES_MISSINGNO5 1762 //#define SPECIES_EGG (SPECIES_GLIMMORA_MEGA + 1) -#define SPECIES_EGG (SPECIES_CHARIATHAN + 1) +#define SPECIES_EGG (SPECIES_MISSINGNO5 + 1) #define NUM_SPECIES SPECIES_EGG diff --git a/pokeemerald-tools/gen-new-pokedex.py b/pokeemerald-tools/gen-new-pokedex.py index b2a6296350..5b143416d0 100644 --- a/pokeemerald-tools/gen-new-pokedex.py +++ b/pokeemerald-tools/gen-new-pokedex.py @@ -17,6 +17,7 @@ Region = "KANTO" National = "NATIONAL" #SpeciesIndex = 1573 #based on mega_glimmora being 1572 SpeciesIndex = 0 #based on making new species.h +IncludeConstantsSpecies = 1 #Print high level information about datafile being accessed if Debug: @@ -27,27 +28,28 @@ if Debug: print(f"First column of tutor-data #{PkmnDataFile.min_column}, Letter:{get_column_letter(PkmnDataFile.min_column)}") print(f"Last column of tutor-data #{PkmnDataFile.max_column}, Letter:{get_column_letter(PkmnDataFile.max_column)}") -with open("species.h", WriteOrAdd) as file: - file.write("//Species File Update\n") - file.write("#ifndef GUARD_CONSTANTS_SPECIES_H\n") - file.write("#define GUARD_CONSTANTS_SPECIES_H\n\n") - file.write(f"#define SPECIES_NONE \t\t {SpeciesIndex} \n") - SpeciesIndex += 1 - - for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): -# if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: -# file.write(f"\t#define SPECIES_ {PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value} \t\t {SpeciesIndex} \n") -# SpeciesIndex += 1 - file.write(f"#define SPECIES_{species[0].value}\t\t{SpeciesIndex}\n") +if Debug: + with open("species.h", WriteOrAdd) as file: + file.write("//Species File Update\n") + file.write("#ifndef GUARD_CONSTANTS_SPECIES_H\n") + file.write("#define GUARD_CONSTANTS_SPECIES_H\n\n") + file.write(f"#define SPECIES_NONE \t\t {SpeciesIndex} \n") SpeciesIndex += 1 - if species[0].row == PkmnDataFile.max_row: - file.write(f"\n#define SPECIES_EGG ({species[0].value} + 1)\n") - - file.write(f"#define NUM_SPECIES SPECIES_EGG\n") - file.write(f"#define SPECIES_SHINY_TAG 5000\n") - file.write(f"#endif // GUARD_CONSTANTS_SPECIES_H\n") - - file.write("//end of program") + + for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): + # if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: + # file.write(f"\t#define SPECIES_ {PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value} \t\t {SpeciesIndex} \n") + # SpeciesIndex += 1 + file.write(f"#define SPECIES_{species[0].value}\t\t{SpeciesIndex}\n") + SpeciesIndex += 1 + if species[0].row == PkmnDataFile.max_row: + file.write(f"\n#define SPECIES_EGG ({species[0].value} + 1)\n") + + file.write(f"#define NUM_SPECIES SPECIES_EGG\n") + file.write(f"#define SPECIES_SHINY_TAG 5000\n") + file.write(f"#endif // GUARD_CONSTANTS_SPECIES_H\n") + + file.write("//end of program") if Debug: with open("species_enabled.h", WriteOrAdd) as file: #species_enabled.h config gen @@ -108,91 +110,93 @@ if Debug: file.write(f"#define P_FAMILY_{row[0].value}\t\t\tP_GEN_EVO_POKEMON\n") file.write(f"\n#endif //GUARD_CONFIG_SPECIES_ENABLED_H") -with open("new-mons_species.h", WriteOrAdd) as file: #species_enabled.h config gen - for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=PkmnDataFile.min_column, max_col=PkmnDataFile.max_column): - for data in species: - if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: - file.write(f"#define P_FAMILY_{species[0].value} \t\t\tP_GEN_EVO_POKEMON\n") - - file.write("//Species File Update\n") - file.write("#ifndef GUARD_CONSTANTS_SPECIES_H\n") - file.write("#define GUARD_CONSTANTS_SPECIES_H\n\n") - file.write(f"#define SPECIES_NONE \t\t {SpeciesIndex} \n") - - - CurrentMaxSpecies = 1572 - SpeciesIndex = CurrentMaxSpecies - SpeciesIndex += 1 - for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column): - for data in species: - if PkmnDataFile.cell(row = 1, column = data.column).value == ".natDexNeeded" and data.value == 1: - file.write(f"#define SPECIES_{species[0].value}\t\t{SpeciesIndex}\n") - SpeciesIndex += 1 - - file.write("//end of program") - -with open("pokedex.h", WriteOrAdd) as file: #species_enabled.h config gen - - file.write(f"//National Dex Start\n") - file.write(f"#ifndef GUARD_CONSTANTS_POKEDEX_H\n") - file.write(f"#define GUARD_CONSTANTS_POKEDEX_H\n") - file.write(f"// National Pokédex order\n") - file.write(f"// These constants are NOT disabled by P_GEN_X_POKEMON to keep pokedex_orders.h clean.\n") - file.write(f"enum NationalDexOrder\n{{\n") - file.write(f"\tNATIONAL_DEX_NONE,\n") - - for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): - for data in species: - #if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: - file.write("\t" + National + "_DEX_" + PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value + ",\n") +if IncludeConstantsSpecies == 1: + with open("new-mons_species.h", WriteOrAdd) as file: #species_enabled.h config gen +# for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=PkmnDataFile.min_column, max_col=PkmnDataFile.max_column): +# for data in species: +# if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: +# file.write(f"#define P_FAMILY_{species[0].value} \t\t\tP_GEN_EVO_POKEMON\n") +# +# file.write("//Species File Update\n") +# file.write("#ifndef GUARD_CONSTANTS_SPECIES_H\n") +# file.write("#define GUARD_CONSTANTS_SPECIES_H\n\n") +# file.write(f"#define SPECIES_NONE \t\t {SpeciesIndex} \n") +# - file.write("};\n\n") - file.write(f"#define NATIONAL_DEX_COUNT NATIONAL_DEX_{PkmnDataFile.cell(PkmnDataFile.max_row,PkmnDataFile.min_column).value}\n") - file.write(f"#define POKEMON_SLOTS_NUMBER NATIONAL_DEX_COUNT + 1\n") - - - file.write("// Kanto Pokédex order\n\n") - file.write("enum KantoDexOrder\n{\n") - file.write("\tKANTO_DEX_NONE,\n") - file.write("\t//" + Region + " Dex Start\n") + CurrentMaxSpecies = 1572 + SpeciesIndex = CurrentMaxSpecies + SpeciesIndex += 1 + for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column): + for data in species: + if PkmnDataFile.cell(row = 1, column = data.column).value == ".natDexNeeded" and data.value == 1: + file.write(f"#define SPECIES_{species[0].value:<20}{SpeciesIndex:>25}\n") + SpeciesIndex += 1 + + file.write("//end of program") - for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): - for data in species: - if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".speciesName": - file.write("\t" + Region + "_DEX_" + data.value + ",\n") +if Debug: + with open("pokedex.h", WriteOrAdd) as file: #species_enabled.h config gen + + file.write(f"//National Dex Start\n") + file.write(f"#ifndef GUARD_CONSTANTS_POKEDEX_H\n") + file.write(f"#define GUARD_CONSTANTS_POKEDEX_H\n") + file.write(f"// National Pokédex order\n") + file.write(f"// These constants are NOT disabled by P_GEN_X_POKEMON to keep pokedex_orders.h clean.\n") + file.write(f"enum NationalDexOrder\n{{\n") + file.write(f"\tNATIONAL_DEX_NONE,\n") + + for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): + for data in species: + #if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".natDexNeeded" and data.value == 1: + file.write("\t" + National + "_DEX_" + PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value + ",\n") + + file.write("};\n\n") + file.write(f"#define NATIONAL_DEX_COUNT NATIONAL_DEX_{PkmnDataFile.cell(PkmnDataFile.max_row,PkmnDataFile.min_column).value}\n") + file.write(f"#define POKEMON_SLOTS_NUMBER NATIONAL_DEX_COUNT + 1\n") + + + file.write("// Kanto Pokédex order\n\n") + file.write("enum KantoDexOrder\n{\n") + file.write("\tKANTO_DEX_NONE,\n") + file.write("\t//" + Region + " Dex Start\n") - file.write("};\n\n") - file.write(f"#define KANTO_DEX_COUNT (KANTO_DEX_{PkmnDataFile.cell(PkmnDataFile.max_row,PkmnDataFile.min_column).value} + 1)\n") - file.write(f"#define HOENN_DEX_COUNT 1\n\n") - file.write(f"#define REGIONAL_DEX_COUNT (IS_FRLG ? KANTO_DEX_COUNT : HOENN_DEX_COUNT)\n\n") - - file.write("#define DECAGRAMS_IN_POUND 4536\n") - file.write("#define CM_PER_INCH 2.54\n") - file.write("#define CM_PER_INCH_FACTOR (CM_PER_INCH * 100)\n") - file.write("#define INCHES_IN_FOOT 12\n") - file.write("#define INCHES_IN_ONE_AND_HALF_FOOT (INCHES_IN_FOOT * 1.5)\n") - file.write("#define INCHES_IN_FOOT_FACTOR (INCHES_IN_FOOT * 10)\n\n") - - file.write("#define WEIGHT_HEIGHT_STR_LEN 16\n") - file.write("#define WEIGHT_HEIGHT_STR_MEM (WEIGHT_HEIGHT_STR_LEN * sizeof(u8))\n\n") - - file.write("#define DEX_HEADER_X 96\n") - file.write("#define DEX_Y_TOP 57\n") - file.write("#define DEX_Y_BOTTOM 73\n") - file.write("#define DEX_MEASUREMENT_X 129\n\n") - - file.write("#define DEX_HGSS_HEADER_X_PADDING 59\n") - file.write("#define DEX_HGSS_Y_TOP_PADDING 7\n") - file.write("#define DEX_HGSS_Y_BOTTOM_PADDING 4\n") - file.write("#define DEX_HGSS_MEASUREMENT_X_PADDING 51\n\n") + for species in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): + for data in species: + if PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".speciesName": + file.write("\t" + Region + "_DEX_" + data.value + ",\n") - file.write("enum\n{\n\tDEX_MODE_HOENN,\n") - file.write("\tDEX_MODE_NATIONAL\n};\n\n") - - file.write("enum\n{\n\tFLAG_GET_SEEN,\n") - file.write("\tFLAG_GET_CAUGHT,\n") - file.write("\tFLAG_SET_SEEN,\n") - file.write("\tFLAG_SET_CAUGHT\n};\n\n") - file.write("#endif") - - file.write("//end of program") \ No newline at end of file + file.write("};\n\n") + file.write(f"#define KANTO_DEX_COUNT (KANTO_DEX_{PkmnDataFile.cell(PkmnDataFile.max_row,PkmnDataFile.min_column).value} + 1)\n") + file.write(f"#define HOENN_DEX_COUNT 1\n\n") + file.write(f"#define REGIONAL_DEX_COUNT (IS_FRLG ? KANTO_DEX_COUNT : HOENN_DEX_COUNT)\n\n") + + file.write("#define DECAGRAMS_IN_POUND 4536\n") + file.write("#define CM_PER_INCH 2.54\n") + file.write("#define CM_PER_INCH_FACTOR (CM_PER_INCH * 100)\n") + file.write("#define INCHES_IN_FOOT 12\n") + file.write("#define INCHES_IN_ONE_AND_HALF_FOOT (INCHES_IN_FOOT * 1.5)\n") + file.write("#define INCHES_IN_FOOT_FACTOR (INCHES_IN_FOOT * 10)\n\n") + + file.write("#define WEIGHT_HEIGHT_STR_LEN 16\n") + file.write("#define WEIGHT_HEIGHT_STR_MEM (WEIGHT_HEIGHT_STR_LEN * sizeof(u8))\n\n") + + file.write("#define DEX_HEADER_X 96\n") + file.write("#define DEX_Y_TOP 57\n") + file.write("#define DEX_Y_BOTTOM 73\n") + file.write("#define DEX_MEASUREMENT_X 129\n\n") + + file.write("#define DEX_HGSS_HEADER_X_PADDING 59\n") + file.write("#define DEX_HGSS_Y_TOP_PADDING 7\n") + file.write("#define DEX_HGSS_Y_BOTTOM_PADDING 4\n") + file.write("#define DEX_HGSS_MEASUREMENT_X_PADDING 51\n\n") + + file.write("enum\n{\n\tDEX_MODE_HOENN,\n") + file.write("\tDEX_MODE_NATIONAL\n};\n\n") + + file.write("enum\n{\n\tFLAG_GET_SEEN,\n") + file.write("\tFLAG_GET_CAUGHT,\n") + file.write("\tFLAG_SET_SEEN,\n") + file.write("\tFLAG_SET_CAUGHT\n};\n\n") + file.write("#endif") + + file.write("//end of program") diff --git a/pokeemerald-tools/new-mons_species.h b/pokeemerald-tools/new-mons_species.h index 43c421e34e..542862042e 100644 --- a/pokeemerald-tools/new-mons_species.h +++ b/pokeemerald-tools/new-mons_species.h @@ -1,386 +1,191 @@ -#define P_FAMILY_ECOSAUR P_GEN_EVO_POKEMON -#define P_FAMILY_TERARISAUR P_GEN_EVO_POKEMON -#define P_FAMILY_SYMBISAUR P_GEN_EVO_POKEMON -#define P_FAMILY_CHARIGUANA P_GEN_EVO_POKEMON -#define P_FAMILY_CHARIANA P_GEN_EVO_POKEMON -#define P_FAMILY_CHARIATHAN P_GEN_EVO_POKEMON -#define P_FAMILY_FERRAPIN P_GEN_EVO_POKEMON -#define P_FAMILY_FORTOISE P_GEN_EVO_POKEMON -#define P_FAMILY_TURTILLERY P_GEN_EVO_POKEMON -#define P_FAMILY_BUTTEFLARE P_GEN_EVO_POKEMON -#define P_FAMILY_PYREFREE P_GEN_EVO_POKEMON -#define P_FAMILY_IMPSECT P_GEN_EVO_POKEMON -#define P_FAMILY_BEEBRUTE P_GEN_EVO_POKEMON -#define P_FAMILY_DRONARCH P_GEN_EVO_POKEMON -#define P_FAMILY_SEPISTRIKE P_GEN_EVO_POKEMON -#define P_FAMILY_PIDGAERO P_GEN_EVO_POKEMON -#define P_FAMILY_PIDGEOZONE P_GEN_EVO_POKEMON -#define P_FAMILY_PIDGEPHYR P_GEN_EVO_POKEMON -#define P_FAMILY_RATTCHET P_GEN_EVO_POKEMON -#define P_FAMILY_RATTARULE P_GEN_EVO_POKEMON -#define P_FAMILY_SNEEROW P_GEN_EVO_POKEMON -#define P_FAMILY_ORNITHOW P_GEN_EVO_POKEMON -#define P_FAMILY_NOHTYP P_GEN_EVO_POKEMON -#define P_FAMILY_ADNOKANA P_GEN_EVO_POKEMON -#define P_FAMILY_GOROCHU P_GEN_EVO_POKEMON -#define P_FAMILY_STROMACHU P_GEN_EVO_POKEMON -#define P_FAMILY_SANDSLAM P_GEN_EVO_POKEMON -#define P_FAMILY_FERODILLO P_GEN_EVO_POKEMON -#define P_FAMILY_NIDOREGAL P_GEN_EVO_POKEMON -#define P_FAMILY_NIDOARCHY P_GEN_EVO_POKEMON -#define P_FAMILY_NIDORULY P_GEN_EVO_POKEMON -#define P_FAMILY_NIDOMINATE P_GEN_EVO_POKEMON -#define P_FAMILY_CLEFAEFAE P_GEN_EVO_POKEMON -#define P_FAMILY_CLEFANAUT P_GEN_EVO_POKEMON -#define P_FAMILY_SPIRITALES P_GEN_EVO_POKEMON -#define P_FAMILY_YOKAYUBI P_GEN_EVO_POKEMON -#define P_FAMILY_GIGGLYHUFF P_GEN_EVO_POKEMON -#define P_FAMILY_BOGGLYFUFF P_GEN_EVO_POKEMON -#define P_FAMILY_POLABAT P_GEN_EVO_POKEMON -#define P_FAMILY_VISIBAT P_GEN_EVO_POKEMON -#define P_FAMILY_HORRIBAT P_GEN_EVO_POKEMON -#define P_FAMILY_RAFFLURK P_GEN_EVO_POKEMON -#define P_FAMILY_CONCORPSIA P_GEN_EVO_POKEMON -#define P_FAMILY_SECTASITE P_GEN_EVO_POKEMON -#define P_FAMILY_FUNGALITH P_GEN_EVO_POKEMON -#define P_FAMILY_VENOMENA P_GEN_EVO_POKEMON -#define P_FAMILY_VENOMENON P_GEN_EVO_POKEMON -#define P_FAMILY_DUGROUPLE P_GEN_EVO_POKEMON -#define P_FAMILY_UNEARTHLET P_GEN_EVO_POKEMON -#define P_FAMILY_DIGLENOID P_GEN_EVO_POKEMON -#define P_FAMILY_FELANKH P_GEN_EVO_POKEMON -#define P_FAMILY_PATRAPHINX P_GEN_EVO_POKEMON -#define P_FAMILY_GILDUCK P_GEN_EVO_POKEMON -#define P_FAMILY_PLATINUPUS P_GEN_EVO_POKEMON -#define P_FAMILY_GORILLASH P_GEN_EVO_POKEMON -#define P_FAMILY_BONUMBELL P_GEN_EVO_POKEMON -#define P_FAMILY_SINGESHA P_GEN_EVO_POKEMON -#define P_FAMILY_GUARDIANCE P_GEN_EVO_POKEMON -#define P_FAMILY_POLITOES P_GEN_EVO_POKEMON -#define P_FAMILY_POLIWISE P_GEN_EVO_POKEMON -#define P_FAMILY_POLIATH P_GEN_EVO_POKEMON -#define P_FAMILY_SIMSALABIM P_GEN_EVO_POKEMON -#define P_FAMILY_VOHOODU P_GEN_EVO_POKEMON -#define P_FAMILY_TZARKARTZ P_GEN_EVO_POKEMON -#define P_FAMILY_MACHULK P_GEN_EVO_POKEMON -#define P_FAMILY_ABOMACHULK P_GEN_EVO_POKEMON -#define P_FAMILY_MACHITAN P_GEN_EVO_POKEMON -#define P_FAMILY_MUCKTRIBEL P_GEN_EVO_POKEMON -#define P_FAMILY_CARNABELL P_GEN_EVO_POKEMON -#define P_FAMILY_DEVLORA P_GEN_EVO_POKEMON -#define P_FAMILY_TENTACATE P_GEN_EVO_POKEMON -#define P_FAMILY_TENTABOMA P_GEN_EVO_POKEMON -#define P_FAMILY_SLAGOLEM P_GEN_EVO_POKEMON -#define P_FAMILY_MOLTREM P_GEN_EVO_POKEMON -#define P_FAMILY_VOLCANICOL P_GEN_EVO_POKEMON -#define P_FAMILY_COMBUSTANG P_GEN_EVO_POKEMON -#define P_FAMILY_KNIGHTMARE P_GEN_EVO_POKEMON -#define P_FAMILY_SLOWMATE P_GEN_EVO_POKEMON -#define P_FAMILY_SLOWCHUM P_GEN_EVO_POKEMON -#define P_FAMILY_MAGNEMELD P_GEN_EVO_POKEMON -#define P_FAMILY_MAGNEMASTR P_GEN_EVO_POKEMON -#define P_FAMILY_FORFOWLD P_GEN_EVO_POKEMON -#define P_FAMILY_FOWLNTOM P_GEN_EVO_POKEMON -#define P_FAMILY_QUADODO P_GEN_EVO_POKEMON -#define P_FAMILY_DODOZEN P_GEN_EVO_POKEMON -#define P_FAMILY_PRECIPED P_GEN_EVO_POKEMON -#define P_FAMILY_MANATII P_GEN_EVO_POKEMON -#define P_FAMILY_GUNK P_GEN_EVO_POKEMON -#define P_FAMILY_SKUM P_GEN_EVO_POKEMON -#define P_FAMILY_ANENEMY P_GEN_EVO_POKEMON -#define P_FAMILY_GLAISHELL P_GEN_EVO_POKEMON -#define P_FAMILY_GENGONE P_GEN_EVO_POKEMON -#define P_FAMILY_POLTERGAST P_GEN_EVO_POKEMON -#define P_FAMILY_GRIMM P_GEN_EVO_POKEMON -#define P_FAMILY_PLATNIX P_GEN_EVO_POKEMON -#define P_FAMILY_OBSIDIANIX P_GEN_EVO_POKEMON -#define P_FAMILY_STALAGMIX P_GEN_EVO_POKEMON -#define P_FAMILY_LULLOO P_GEN_EVO_POKEMON -#define P_FAMILY_SOMNISOOTH P_GEN_EVO_POKEMON -#define P_FAMILY_KRAKLAW P_GEN_EVO_POKEMON -#define P_FAMILY_TEKLAWNO P_GEN_EVO_POKEMON -#define P_FAMILY_ELECTRODES P_GEN_EVO_POKEMON -#define P_FAMILY_ELECTRODEX P_GEN_EVO_POKEMON -#define P_FAMILY_ELECTRODEM P_GEN_EVO_POKEMON -#define P_FAMILY_EXEGGITY P_GEN_EVO_POKEMON -#define P_FAMILY_EXEGGTRIC P_GEN_EVO_POKEMON -#define P_FAMILY_OSSELOBBER P_GEN_EVO_POKEMON -#define P_FAMILY_WRAIWRATH P_GEN_EVO_POKEMON -#define P_FAMILY_CLEEVOYANT P_GEN_EVO_POKEMON -#define P_FAMILY_SPIRITULEE P_GEN_EVO_POKEMON -#define P_FAMILY_ENCHANCED P_GEN_EVO_POKEMON -#define P_FAMILY_RADIACHAN P_GEN_EVO_POKEMON -#define P_FAMILY_LICKILOLLY P_GEN_EVO_POKEMON -#define P_FAMILY_LICKILATO P_GEN_EVO_POKEMON -#define P_FAMILY_HEEVING P_GEN_EVO_POKEMON -#define P_FAMILY_CHOHKING P_GEN_EVO_POKEMON -#define P_FAMILY_RHYMARKABL P_GEN_EVO_POKEMON -#define P_FAMILY_RHYLIC P_GEN_EVO_POKEMON -#define P_FAMILY_RHYBORN P_GEN_EVO_POKEMON -#define P_FAMILY_GOGETTEY P_GEN_EVO_POKEMON -#define P_FAMILY_LUKKEY P_GEN_EVO_POKEMON -#define P_FAMILY_FORTUNITEY P_GEN_EVO_POKEMON -#define P_FAMILY_TANGATHER P_GEN_EVO_POKEMON -#define P_FAMILY_TANGOLIATH P_GEN_EVO_POKEMON -#define P_FAMILY_TANGRAPPLE P_GEN_EVO_POKEMON -#define P_FAMILY_KANGAKID P_GEN_EVO_POKEMON -#define P_FAMILY_KANGALLOUS P_GEN_EVO_POKEMON -#define P_FAMILY_KANGARUTAL P_GEN_EVO_POKEMON -#define P_FAMILY_LORDRA P_GEN_EVO_POKEMON -#define P_FAMILY_PINNADRA P_GEN_EVO_POKEMON -#define P_FAMILY_SEAREX P_GEN_EVO_POKEMON -#define P_FAMILY_CAPRISEA P_GEN_EVO_POKEMON -#define P_FAMILY_STARUS P_GEN_EVO_POKEMON -#define P_FAMILY_STARWE P_GEN_EVO_POKEMON -#define P_FAMILY_MR_JEST P_GEN_EVO_POKEMON -#define P_FAMILY_MR_FOOL P_GEN_EVO_POKEMON -#define P_FAMILY_RAZER P_GEN_EVO_POKEMON -#define P_FAMILY_CLAYMOR P_GEN_EVO_POKEMON -#define P_FAMILY_JYNKIES P_GEN_EVO_POKEMON -#define P_FAMILY_JEEPERS P_GEN_EVO_POKEMON -#define P_FAMILY_ELECTIVINE P_GEN_EVO_POKEMON -#define P_FAMILY_ELECTIWIZZ P_GEN_EVO_POKEMON -#define P_FAMILY_MAGMORE P_GEN_EVO_POKEMON -#define P_FAMILY_MAGMOLTEN P_GEN_EVO_POKEMON -#define P_FAMILY_PINSIRIOR P_GEN_EVO_POKEMON -#define P_FAMILY_ABYSSIR P_GEN_EVO_POKEMON -#define P_FAMILY_TAUROX P_GEN_EVO_POKEMON -#define P_FAMILY_OXENFREE P_GEN_EVO_POKEMON -#define P_FAMILY_HYDRADOS P_GEN_EVO_POKEMON -#define P_FAMILY_DRACOSMIC P_GEN_EVO_POKEMON -#define P_FAMILY_QUAZAR P_GEN_EVO_POKEMON -#define P_FAMILY_LOCHLASS P_GEN_EVO_POKEMON -#define P_FAMILY_NESSEA P_GEN_EVO_POKEMON -#define P_FAMILY_MORPHO P_GEN_EVO_POKEMON -#define P_FAMILY_METAMORPHO P_GEN_EVO_POKEMON -#define P_FAMILY_RIVEON P_GEN_EVO_POKEMON -#define P_FAMILY_BRINEON P_GEN_EVO_POKEMON -#define P_FAMILY_PLASMEON P_GEN_EVO_POKEMON -#define P_FAMILY_GALVEON P_GEN_EVO_POKEMON -#define P_FAMILY_SMOLDEON P_GEN_EVO_POKEMON -#define P_FAMILY_INFERNEON P_GEN_EVO_POKEMON -#define P_FAMILY_PORYGONX P_GEN_EVO_POKEMON -#define P_FAMILY_PORYGONQ P_GEN_EVO_POKEMON -#define P_FAMILY_PORYGON2A4 P_GEN_EVO_POKEMON -#define P_FAMILY_OMAPAL P_GEN_EVO_POKEMON -#define P_FAMILY_OMAGUS P_GEN_EVO_POKEMON -#define P_FAMILY_KABUTAK P_GEN_EVO_POKEMON -#define P_FAMILY_KABUSTION P_GEN_EVO_POKEMON -#define P_FAMILY_MANDILUFT P_GEN_EVO_POKEMON -#define P_FAMILY_AMBALITHIC P_GEN_EVO_POKEMON -#define P_FAMILY_ACTLAX P_GEN_EVO_POKEMON -#define P_FAMILY_GRIZZLAX P_GEN_EVO_POKEMON -#define P_FAMILY_SNOWONE P_GEN_EVO_POKEMON -#define P_FAMILY_FROSTUNUS P_GEN_EVO_POKEMON -#define P_FAMILY_SHOCKATOO P_GEN_EVO_POKEMON -#define P_FAMILY_VOLTDUO P_GEN_EVO_POKEMON -#define P_FAMILY_IGNITHREE P_GEN_EVO_POKEMON -#define P_FAMILY_INFERNTRI P_GEN_EVO_POKEMON -#define P_FAMILY_DRAGONIER P_GEN_EVO_POKEMON -#define P_FAMILY_DRAGONACE P_GEN_EVO_POKEMON -#define P_FAMILY_DRAGONTALE P_GEN_EVO_POKEMON -#define P_FAMILY_MEWTHREE P_GEN_EVO_POKEMON -#define P_FAMILY_MEWFOUR P_GEN_EVO_POKEMON -#define P_FAMILY_NYU P_GEN_EVO_POKEMON -#define P_FAMILY_IOTA P_GEN_EVO_POKEMON -#define P_FAMILY_MISSINGNO1 P_GEN_EVO_POKEMON -#define P_FAMILY_MISSINGNO2 P_GEN_EVO_POKEMON -#define P_FAMILY_MISSINGNO3 P_GEN_EVO_POKEMON -#define P_FAMILY_MISSINGNO4 P_GEN_EVO_POKEMON -#define P_FAMILY_MISSINGNO5 P_GEN_EVO_POKEMON -//Species File Update -#ifndef GUARD_CONSTANTS_SPECIES_H -#define GUARD_CONSTANTS_SPECIES_H - -#define SPECIES_NONE 355 -#define SPECIES_ECOSAUR 1573 -#define SPECIES_TERARISAUR 1574 -#define SPECIES_SYMBISAUR 1575 -#define SPECIES_CHARIGUANA 1576 -#define SPECIES_CHARIANA 1577 -#define SPECIES_CHARIATHAN 1578 -#define SPECIES_FERRAPIN 1579 -#define SPECIES_FORTOISE 1580 -#define SPECIES_TURTILLERY 1581 -#define SPECIES_BUTTEFLARE 1582 -#define SPECIES_PYREFREE 1583 -#define SPECIES_IMPSECT 1584 -#define SPECIES_BEEBRUTE 1585 -#define SPECIES_DRONARCH 1586 -#define SPECIES_SEPISTRIKE 1587 -#define SPECIES_PIDGAERO 1588 -#define SPECIES_PIDGEOZONE 1589 -#define SPECIES_PIDGEPHYR 1590 -#define SPECIES_RATTCHET 1591 -#define SPECIES_RATTARULE 1592 -#define SPECIES_SNEEROW 1593 -#define SPECIES_ORNITHOW 1594 -#define SPECIES_NOHTYP 1595 -#define SPECIES_ADNOKANA 1596 -#define SPECIES_GOROCHU 1597 -#define SPECIES_STROMACHU 1598 -#define SPECIES_SANDSLAM 1599 -#define SPECIES_FERODILLO 1600 -#define SPECIES_NIDOREGAL 1601 -#define SPECIES_NIDOARCHY 1602 -#define SPECIES_NIDORULY 1603 -#define SPECIES_NIDOMINATE 1604 -#define SPECIES_CLEFAEFAE 1605 -#define SPECIES_CLEFANAUT 1606 -#define SPECIES_SPIRITALES 1607 -#define SPECIES_YOKAYUBI 1608 -#define SPECIES_GIGGLYHUFF 1609 -#define SPECIES_BOGGLYFUFF 1610 -#define SPECIES_POLABAT 1611 -#define SPECIES_VISIBAT 1612 -#define SPECIES_HORRIBAT 1613 -#define SPECIES_RAFFLURK 1614 -#define SPECIES_CONCORPSIA 1615 -#define SPECIES_SECTASITE 1616 -#define SPECIES_FUNGALITH 1617 -#define SPECIES_VENOMENA 1618 -#define SPECIES_VENOMENON 1619 -#define SPECIES_DUGROUPLE 1620 -#define SPECIES_UNEARTHLET 1621 -#define SPECIES_DIGLENOID 1622 -#define SPECIES_FELANKH 1623 -#define SPECIES_PATRAPHINX 1624 -#define SPECIES_GILDUCK 1625 -#define SPECIES_PLATINUPUS 1626 -#define SPECIES_GORILLASH 1627 -#define SPECIES_BONUMBELL 1628 -#define SPECIES_SINGESHA 1629 -#define SPECIES_GUARDIANCE 1630 -#define SPECIES_POLITOES 1631 -#define SPECIES_POLIWISE 1632 -#define SPECIES_POLIATH 1633 -#define SPECIES_SIMSALABIM 1634 -#define SPECIES_VOHOODU 1635 -#define SPECIES_TZARKARTZ 1636 -#define SPECIES_MACHULK 1637 -#define SPECIES_ABOMACHULK 1638 -#define SPECIES_MACHITAN 1639 -#define SPECIES_MUCKTRIBEL 1640 -#define SPECIES_CARNABELL 1641 -#define SPECIES_DEVLORA 1642 -#define SPECIES_TENTACATE 1643 -#define SPECIES_TENTABOMA 1644 -#define SPECIES_SLAGOLEM 1645 -#define SPECIES_MOLTREM 1646 -#define SPECIES_VOLCANICOL 1647 -#define SPECIES_COMBUSTANG 1648 -#define SPECIES_KNIGHTMARE 1649 -#define SPECIES_SLOWMATE 1650 -#define SPECIES_SLOWCHUM 1651 -#define SPECIES_MAGNEMELD 1652 -#define SPECIES_MAGNEMASTR 1653 -#define SPECIES_FORFOWLD 1654 -#define SPECIES_FOWLNTOM 1655 -#define SPECIES_QUADODO 1656 -#define SPECIES_DODOZEN 1657 -#define SPECIES_PRECIPED 1658 -#define SPECIES_MANATII 1659 -#define SPECIES_GUNK 1660 -#define SPECIES_SKUM 1661 -#define SPECIES_ANENEMY 1662 -#define SPECIES_GLAISHELL 1663 -#define SPECIES_GENGONE 1664 -#define SPECIES_POLTERGAST 1665 -#define SPECIES_GRIMM 1666 -#define SPECIES_PLATNIX 1667 -#define SPECIES_OBSIDIANIX 1668 -#define SPECIES_STALAGMIX 1669 -#define SPECIES_LULLOO 1670 -#define SPECIES_SOMNISOOTH 1671 -#define SPECIES_KRAKLAW 1672 -#define SPECIES_TEKLAWNO 1673 -#define SPECIES_ELECTRODES 1674 -#define SPECIES_ELECTRODEX 1675 -#define SPECIES_ELECTRODEM 1676 -#define SPECIES_EXEGGITY 1677 -#define SPECIES_EXEGGTRIC 1678 -#define SPECIES_OSSELOBBER 1679 -#define SPECIES_WRAIWRATH 1680 -#define SPECIES_CLEEVOYANT 1681 -#define SPECIES_SPIRITULEE 1682 -#define SPECIES_ENCHANCED 1683 -#define SPECIES_RADIACHAN 1684 -#define SPECIES_LICKILOLLY 1685 -#define SPECIES_LICKILATO 1686 -#define SPECIES_HEEVING 1687 -#define SPECIES_CHOHKING 1688 -#define SPECIES_RHYMARKABL 1689 -#define SPECIES_RHYLIC 1690 -#define SPECIES_RHYBORN 1691 -#define SPECIES_GOGETTEY 1692 -#define SPECIES_LUKKEY 1693 -#define SPECIES_FORTUNITEY 1694 -#define SPECIES_TANGATHER 1695 -#define SPECIES_TANGOLIATH 1696 -#define SPECIES_TANGRAPPLE 1697 -#define SPECIES_KANGAKID 1698 -#define SPECIES_KANGALLOUS 1699 -#define SPECIES_KANGARUTAL 1700 -#define SPECIES_LORDRA 1701 -#define SPECIES_PINNADRA 1702 -#define SPECIES_SEAREX 1703 -#define SPECIES_CAPRISEA 1704 -#define SPECIES_STARUS 1705 -#define SPECIES_STARWE 1706 -#define SPECIES_MR_JEST 1707 -#define SPECIES_MR_FOOL 1708 -#define SPECIES_RAZER 1709 -#define SPECIES_CLAYMOR 1710 -#define SPECIES_JYNKIES 1711 -#define SPECIES_JEEPERS 1712 -#define SPECIES_ELECTIVINE 1713 -#define SPECIES_ELECTIWIZZ 1714 -#define SPECIES_MAGMORE 1715 -#define SPECIES_MAGMOLTEN 1716 -#define SPECIES_PINSIRIOR 1717 -#define SPECIES_ABYSSIR 1718 -#define SPECIES_TAUROX 1719 -#define SPECIES_OXENFREE 1720 -#define SPECIES_HYDRADOS 1721 -#define SPECIES_DRACOSMIC 1722 -#define SPECIES_QUAZAR 1723 -#define SPECIES_LOCHLASS 1724 -#define SPECIES_NESSEA 1725 -#define SPECIES_MORPHO 1726 -#define SPECIES_METAMORPHO 1727 -#define SPECIES_RIVEON 1728 -#define SPECIES_BRINEON 1729 -#define SPECIES_PLASMEON 1730 -#define SPECIES_GALVEON 1731 -#define SPECIES_SMOLDEON 1732 -#define SPECIES_INFERNEON 1733 -#define SPECIES_PORYGONX 1734 -#define SPECIES_PORYGONQ 1735 -#define SPECIES_PORYGON2A4 1736 -#define SPECIES_OMAPAL 1737 -#define SPECIES_OMAGUS 1738 -#define SPECIES_KABUTAK 1739 -#define SPECIES_KABUSTION 1740 -#define SPECIES_MANDILUFT 1741 -#define SPECIES_AMBALITHIC 1742 -#define SPECIES_ACTLAX 1743 -#define SPECIES_GRIZZLAX 1744 -#define SPECIES_SNOWONE 1745 -#define SPECIES_FROSTUNUS 1746 -#define SPECIES_SHOCKATOO 1747 -#define SPECIES_VOLTDUO 1748 -#define SPECIES_IGNITHREE 1749 -#define SPECIES_INFERNTRI 1750 -#define SPECIES_DRAGONIER 1751 -#define SPECIES_DRAGONACE 1752 -#define SPECIES_DRAGONTALE 1753 -#define SPECIES_MEWTHREE 1754 -#define SPECIES_MEWFOUR 1755 -#define SPECIES_NYU 1756 -#define SPECIES_IOTA 1757 -#define SPECIES_MISSINGNO1 1758 -#define SPECIES_MISSINGNO2 1759 -#define SPECIES_MISSINGNO3 1760 -#define SPECIES_MISSINGNO4 1761 -#define SPECIES_MISSINGNO5 1762 +#define SPECIES_ECOSAUR 1573 +#define SPECIES_TERARISAUR 1574 +#define SPECIES_SYMBISAUR 1575 +#define SPECIES_CHARIGUANA 1576 +#define SPECIES_CHARIANA 1577 +#define SPECIES_CHARIATHAN 1578 +#define SPECIES_FERRAPIN 1579 +#define SPECIES_FORTOISE 1580 +#define SPECIES_TURTILLERY 1581 +#define SPECIES_BUTTEFLARE 1582 +#define SPECIES_PYREFREE 1583 +#define SPECIES_IMPSECT 1584 +#define SPECIES_BEEBRUTE 1585 +#define SPECIES_DRONARCH 1586 +#define SPECIES_SEPISTRIKE 1587 +#define SPECIES_PIDGAERO 1588 +#define SPECIES_PIDGEOZONE 1589 +#define SPECIES_PIDGEPHYR 1590 +#define SPECIES_RATTCHET 1591 +#define SPECIES_RATTARULE 1592 +#define SPECIES_SNEEROW 1593 +#define SPECIES_ORNITHOW 1594 +#define SPECIES_NOHTYP 1595 +#define SPECIES_ADNOKANA 1596 +#define SPECIES_GOROCHU 1597 +#define SPECIES_STROMACHU 1598 +#define SPECIES_SANDSLAM 1599 +#define SPECIES_FERODILLO 1600 +#define SPECIES_NIDOREGAL 1601 +#define SPECIES_NIDOARCHY 1602 +#define SPECIES_NIDORULY 1603 +#define SPECIES_NIDOMINATE 1604 +#define SPECIES_CLEFAEFAE 1605 +#define SPECIES_CLEFANAUT 1606 +#define SPECIES_SPIRITALES 1607 +#define SPECIES_YOKAYUBI 1608 +#define SPECIES_GIGGLYHUFF 1609 +#define SPECIES_BOGGLYFUFF 1610 +#define SPECIES_POLABAT 1611 +#define SPECIES_VISIBAT 1612 +#define SPECIES_HORRIBAT 1613 +#define SPECIES_RAFFLURK 1614 +#define SPECIES_CONCORPSIA 1615 +#define SPECIES_SECTASITE 1616 +#define SPECIES_FUNGALITH 1617 +#define SPECIES_VENOMENA 1618 +#define SPECIES_VENOMENON 1619 +#define SPECIES_DUGROUPLE 1620 +#define SPECIES_UNEARTHLET 1621 +#define SPECIES_DIGLENOID 1622 +#define SPECIES_FELANKH 1623 +#define SPECIES_PATRAPHINX 1624 +#define SPECIES_GILDUCK 1625 +#define SPECIES_PLATINUPUS 1626 +#define SPECIES_GORILLASH 1627 +#define SPECIES_BONUMBELL 1628 +#define SPECIES_SINGESHA 1629 +#define SPECIES_GUARDIANCE 1630 +#define SPECIES_POLITOES 1631 +#define SPECIES_POLIWISE 1632 +#define SPECIES_POLIATH 1633 +#define SPECIES_SIMSALABIM 1634 +#define SPECIES_VOHOODU 1635 +#define SPECIES_TZARKARTZ 1636 +#define SPECIES_MACHULK 1637 +#define SPECIES_ABOMACHULK 1638 +#define SPECIES_MACHITAN 1639 +#define SPECIES_MUCKTRIBEL 1640 +#define SPECIES_CARNABELL 1641 +#define SPECIES_DEVLORA 1642 +#define SPECIES_TENTACATE 1643 +#define SPECIES_TENTABOMA 1644 +#define SPECIES_SLAGOLEM 1645 +#define SPECIES_MOLTREM 1646 +#define SPECIES_VOLCANICOL 1647 +#define SPECIES_COMBUSTANG 1648 +#define SPECIES_KNIGHTMARE 1649 +#define SPECIES_SLOWMATE 1650 +#define SPECIES_SLOWCHUM 1651 +#define SPECIES_MAGNEMELD 1652 +#define SPECIES_MAGNEMASTR 1653 +#define SPECIES_FORFOWLD 1654 +#define SPECIES_FOWLNTOM 1655 +#define SPECIES_QUADODO 1656 +#define SPECIES_DODOZEN 1657 +#define SPECIES_PRECIPED 1658 +#define SPECIES_MANATII 1659 +#define SPECIES_GUNK 1660 +#define SPECIES_SKUM 1661 +#define SPECIES_ANENEMY 1662 +#define SPECIES_GLAISHELL 1663 +#define SPECIES_GENGONE 1664 +#define SPECIES_POLTERGAST 1665 +#define SPECIES_GRIMM 1666 +#define SPECIES_PLATNIX 1667 +#define SPECIES_OBSIDIANIX 1668 +#define SPECIES_STALAGMIX 1669 +#define SPECIES_LULLOO 1670 +#define SPECIES_SOMNISOOTH 1671 +#define SPECIES_KRAKLAW 1672 +#define SPECIES_TEKLAWNO 1673 +#define SPECIES_ELECTRODES 1674 +#define SPECIES_ELECTRODEX 1675 +#define SPECIES_ELECTRODEM 1676 +#define SPECIES_EXEGGITY 1677 +#define SPECIES_EXEGGTRIC 1678 +#define SPECIES_OSSELOBBER 1679 +#define SPECIES_WRAIWRATH 1680 +#define SPECIES_CLEEVOYANT 1681 +#define SPECIES_SPIRITULEE 1682 +#define SPECIES_ENCHANCED 1683 +#define SPECIES_RADIACHAN 1684 +#define SPECIES_LICKILOLLY 1685 +#define SPECIES_LICKILATO 1686 +#define SPECIES_HEEVING 1687 +#define SPECIES_CHOHKING 1688 +#define SPECIES_RHYMARKABL 1689 +#define SPECIES_RHYLIC 1690 +#define SPECIES_RHYBORN 1691 +#define SPECIES_GOGETTEY 1692 +#define SPECIES_LUKKEY 1693 +#define SPECIES_FORTUNITEY 1694 +#define SPECIES_TANGATHER 1695 +#define SPECIES_TANGOLIATH 1696 +#define SPECIES_TANGRAPPLE 1697 +#define SPECIES_KANGAKID 1698 +#define SPECIES_KANGALLOUS 1699 +#define SPECIES_KANGARUTAL 1700 +#define SPECIES_LORDRA 1701 +#define SPECIES_PINNADRA 1702 +#define SPECIES_SEAREX 1703 +#define SPECIES_CAPRISEA 1704 +#define SPECIES_STARUS 1705 +#define SPECIES_STARWE 1706 +#define SPECIES_MR_JEST 1707 +#define SPECIES_MR_FOOL 1708 +#define SPECIES_RAZER 1709 +#define SPECIES_CLAYMOR 1710 +#define SPECIES_JYNKIES 1711 +#define SPECIES_JEEPERS 1712 +#define SPECIES_ELECTIVINE 1713 +#define SPECIES_ELECTIWIZZ 1714 +#define SPECIES_MAGMORE 1715 +#define SPECIES_MAGMOLTEN 1716 +#define SPECIES_PINSIRIOR 1717 +#define SPECIES_ABYSSIR 1718 +#define SPECIES_TAUROX 1719 +#define SPECIES_OXENFREE 1720 +#define SPECIES_HYDRADOS 1721 +#define SPECIES_DRACOSMIC 1722 +#define SPECIES_QUAZAR 1723 +#define SPECIES_LOCHLASS 1724 +#define SPECIES_NESSEA 1725 +#define SPECIES_MORPHO 1726 +#define SPECIES_METAMORPHO 1727 +#define SPECIES_RIVEON 1728 +#define SPECIES_BRINEON 1729 +#define SPECIES_PLASMEON 1730 +#define SPECIES_GALVEON 1731 +#define SPECIES_SMOLDEON 1732 +#define SPECIES_INFERNEON 1733 +#define SPECIES_PORYGONX 1734 +#define SPECIES_PORYGONQ 1735 +#define SPECIES_PORYGON2A4 1736 +#define SPECIES_OMAPAL 1737 +#define SPECIES_OMAGUS 1738 +#define SPECIES_KABUTAK 1739 +#define SPECIES_KABUSTION 1740 +#define SPECIES_MANDILUFT 1741 +#define SPECIES_AMBALITHIC 1742 +#define SPECIES_ACTLAX 1743 +#define SPECIES_GRIZZLAX 1744 +#define SPECIES_SNOWONE 1745 +#define SPECIES_FROSTUNUS 1746 +#define SPECIES_SHOCKATOO 1747 +#define SPECIES_VOLTDUO 1748 +#define SPECIES_IGNITHREE 1749 +#define SPECIES_INFERNTRI 1750 +#define SPECIES_DRAGONIER 1751 +#define SPECIES_DRAGONACE 1752 +#define SPECIES_DRAGONTALE 1753 +#define SPECIES_MEWTHREE 1754 +#define SPECIES_MEWFOUR 1755 +#define SPECIES_NYU 1756 +#define SPECIES_IOTA 1757 +#define SPECIES_MISSINGNO1 1758 +#define SPECIES_MISSINGNO2 1759 +#define SPECIES_MISSINGNO3 1760 +#define SPECIES_MISSINGNO4 1761 +#define SPECIES_MISSINGNO5 1762 //end of program \ No newline at end of file