Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-07 09:35:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge Errors

Browse Source
This commit is contained in:
Skeli
2020-05-01 15:13:56 +03:00
parent 9f0da24417
commit 1b27c1424a
2 changed files with 0 additions and 4223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3945
src/Pokedex_Data_Table.c
View File

File diff suppressed because it is too large Load Diff

278
src/Pokedex_Orders.c
View File

@@ -3,7 +3,6 @@
const u16 gPokedexOrder_Regional[] =
{
<<<<<<< Updated upstream
NATIONAL_DEX_BULBASAUR,
NATIONAL_DEX_IVYSAUR,
NATIONAL_DEX_VENUSAUR,
@@ -155,283 +154,6 @@ const u16 gPokedexOrder_Regional[] =
NATIONAL_DEX_DRAGONITE,
NATIONAL_DEX_MEWTWO,
NATIONAL_DEX_MEW,
=======
SPECIES_SNORUNT,
SPECIES_GLALIE,
SPECIES_FROSLASS,
SPECIES_VANILLITE,
SPECIES_VANILLISH,
SPECIES_VANILLUXE,
SPECIES_DELIBIRD,
SPECIES_MINIOR_SHIELD,
SPECIES_SNEASEL,
SPECIES_WEAVILE,
SPECIES_ZUBAT,
SPECIES_GOLBAT,
SPECIES_CROBAT,
SPECIES_MAKUHITA,
SPECIES_HARIYAMA,
SPECIES_SPHEAL,
SPECIES_SEALEO,
SPECIES_WALREIN,
SPECIES_SMOOCHUM,
SPECIES_JYNX,
SPECIES_ROGGENROLA,
SPECIES_BOLDORE,
SPECIES_GIGALITH,
SPECIES_SWINUB,
SPECIES_PILOSWINE,
SPECIES_MAMOSWINE,
SPECIES_BERGMITE,
SPECIES_AVALUGG,
SPECIES_DRILBUR,
SPECIES_EXCADRILL,
SPECIES_MAWILE,
SPECIES_SANDSHREW_A,
SPECIES_SANDSLASH_A,
SPECIES_STARLY,
SPECIES_STARAVIA,
SPECIES_STARAPTOR,
SPECIES_HOOTHOOT,
SPECIES_NOCTOWL,
SPECIES_PATRAT,
SPECIES_WATCHOG,
SPECIES_RATTATA,
SPECIES_RATICATE,
SPECIES_BUDEW,
SPECIES_ROSELIA,
SPECIES_ROSERADE,
SPECIES_SWABLU,
SPECIES_ALTARIA,
SPECIES_ELECTRIKE,
SPECIES_MANECTRIC,
SPECIES_AZURILL,
SPECIES_MARILL,
SPECIES_AZUMARILL,
SPECIES_STUFFUL,
SPECIES_BEWEAR,
SPECIES_SCRAGGY,
SPECIES_SCRAFTY,
SPECIES_RIOLU,
SPECIES_LUCARIO,
SPECIES_POOCHYENA,
SPECIES_MIGHTYENA,
SPECIES_WINGULL,
SPECIES_PELIPPER,
SPECIES_SENTRET,
SPECIES_FURRET,
SPECIES_BIDOOF,
SPECIES_BIBAREL,
SPECIES_BUIZEL,
SPECIES_FLOATZEL,
SPECIES_SHELLOS,
SPECIES_GASTRODON,
SPECIES_DEWPIDER,
SPECIES_ARAQUANID,
SPECIES_SURSKIT,
SPECIES_MASQUERAIN,
SPECIES_KRABBY,
SPECIES_KINGLER,
SPECIES_BURMY,
SPECIES_WORMADAM,
SPECIES_MOTHIM,
SPECIES_FLABEBE,
SPECIES_FLOETTE,
SPECIES_FLORGES,
SPECIES_CUTIEFLY,
SPECIES_RIBOMBEE,
SPECIES_ORICORIO,
SPECIES_PANSAGE,
SPECIES_SIMISAGE,
SPECIES_PANSEAR,
SPECIES_SIMISEAR,
SPECIES_PANPOUR,
SPECIES_SIMIPOUR,
SPECIES_COMBEE,
SPECIES_VESPIQUEN,
SPECIES_COMFEY,
SPECIES_CHERUBI,
SPECIES_CHERRIM,
SPECIES_CATERPIE,
SPECIES_METAPOD,
SPECIES_BUTTERFREE,
SPECIES_WEEDLE,
SPECIES_KAKUNA,
SPECIES_BEEDRILL,
SPECIES_SEEDOT,
SPECIES_NUZLEAF,
SPECIES_SHIFTRY,
SPECIES_PUMPKABOO,
SPECIES_GOURGEIST,
SPECIES_GASTLY,
SPECIES_HAUNTER,
SPECIES_GENGAR,
SPECIES_SHUPPET,
SPECIES_BANETTE,
SPECIES_DUSKULL,
SPECIES_DUSCLOPS,
SPECIES_DUSKNOIR,
SPECIES_PHANTUMP,
SPECIES_TREVENANT,
SPECIES_NINCADA,
SPECIES_NINJASK,
SPECIES_SHEDINJA,
SPECIES_PIKIPEK,
SPECIES_TRUMBEAK,
SPECIES_TOUCANNON,
SPECIES_LILLIPUP,
SPECIES_HERDIER,
SPECIES_STOUTLAND,
SPECIES_EKANS,
SPECIES_ARBOK,
SPECIES_NUMEL,
SPECIES_CAMERUPT,
SPECIES_MANKEY,
SPECIES_PRIMEAPE,
SPECIES_RALTS,
SPECIES_KIRLIA,
SPECIES_GARDEVOIR,
SPECIES_GALLADE,
SPECIES_LITLEO,
SPECIES_PYROAR,
SPECIES_WOOBAT,
SPECIES_SWOOBAT,
SPECIES_SLUGMA,
SPECIES_MAGCARGO,
SPECIES_SALANDIT,
SPECIES_SALAZZLE,
SPECIES_GEODUDE,
SPECIES_GRAVELER,
SPECIES_GOLEM,
SPECIES_TORKOAL,
SPECIES_MAGBY,
SPECIES_MAGMAR,
SPECIES_MAGMORTAR,
SPECIES_VULPIX,
SPECIES_NINETALES,
SPECIES_TAILLOW,
SPECIES_SWELLOW,
SPECIES_MURKROW,
SPECIES_HONCHKROW,
SPECIES_BUNNELBY,
SPECIES_DIGGERSBY,
SPECIES_NIDORAN_M,
SPECIES_NIDORINO,
SPECIES_NIDOKING,
SPECIES_NIDORAN_F,
SPECIES_NIDORINA,
SPECIES_NIDOQUEEN,
SPECIES_GROWLITHE,
SPECIES_ARCANINE,
SPECIES_HOUNDOUR,
SPECIES_HOUNDOOM,
SPECIES_DEDENNE,
SPECIES_PURRLOIN,
SPECIES_LIEPARD,
SPECIES_ARON,
SPECIES_LAIRON,
SPECIES_AGGRON,
SPECIES_NOSEPASS,
SPECIES_PROBOPASS,
SPECIES_NOIBAT,
SPECIES_NOIVERN,
SPECIES_PHANPY,
SPECIES_DONPHAN,
SPECIES_GLIGAR,
SPECIES_GLISCOR,
SPECIES_DUNSPARCE,
SPECIES_ZIGZAGOON,
SPECIES_LINOONE,
SPECIES_LEDYBA,
SPECIES_LEDIAN,
SPECIES_SPINARAK,
SPECIES_ARIADOS,
SPECIES_SHINX,
SPECIES_LUXIO,
SPECIES_LUXRAY,
SPECIES_DEERLING,
SPECIES_SAWSBUCK,
SPECIES_SUNKERN,
SPECIES_SUNFLORA,
SPECIES_KRICKETOT,
SPECIES_KRICKETUNE,
SPECIES_SMEARGLE,
SPECIES_YUNGOOS,
SPECIES_GUMSHOOS,
SPECIES_DODUO,
SPECIES_DODRIO,
SPECIES_BUNEARY,
SPECIES_LOPUNNY,
SPECIES_ABRA,
SPECIES_KADABRA,
SPECIES_ALAKAZAM,
SPECIES_MAREEP,
SPECIES_FLAAFFY,
SPECIES_AMPHAROS,
SPECIES_ESPURR,
SPECIES_MEOWSTIC,
SPECIES_DROWZEE,
SPECIES_HYPNO,
SPECIES_MIME_JR,
SPECIES_MR_MIME,
SPECIES_MAGIKARP,
SPECIES_GYARADOS,
SPECIES_BRONZOR,
SPECIES_BRONZONG,
SPECIES_ONIX,
SPECIES_STEELIX,
SPECIES_CRYOGONAL,
SPECIES_CARBINK,
SPECIES_SNOVER,
SPECIES_ABOMASNOW,
SPECIES_CUBCHOO,
SPECIES_BEARTIC,
SPECIES_STANTLER,
SPECIES_CRABRAWLER,
SPECIES_CRABOMINABLE,
SPECIES_SPEAROW,
SPECIES_FEAROW,
SPECIES_GRUBBIN,
SPECIES_CHARJABUG,
SPECIES_VIKAVOLT,
SPECIES_SHROOMISH,
SPECIES_BRELOOM,
SPECIES_SKORUPI,
SPECIES_DRAPION,
SPECIES_HAPPINY,
SPECIES_CHANSEY,
SPECIES_BLISSEY,
SPECIES_KARRABLAST,
SPECIES_ESCAVALIER,
SPECIES_LOTAD,
SPECIES_LOMBRE,
SPECIES_LUDICOLO,
SPECIES_TYMPOLE,
SPECIES_PALPITOAD,
SPECIES_SEISMITOAD,
SPECIES_MILTANK,
SPECIES_LICKITUNG,
SPECIES_GOOMY,
SPECIES_SLIGGOO,
SPECIES_GOODRA,
SPECIES_SHELMET,
SPECIES_ACCELGOR,
SPECIES_EXEGGCUTE,
SPECIES_EXEGGUTOR,
SPECIES_MEOWTH,
SPECIES_PERSIAN,
SPECIES_YANMA,
SPECIES_YANMEGA,
SPECIES_VENONAT,
SPECIES_VENOMOTH,
SPECIES_SPOINK,
SPECIES_GRUMPIG,
SPECIES_MEDITITE,
SPECIES_MEDICHAM,
SPECIES_ABSOL,
SPECIES_GLAMEOW,
SPECIES_PURUGLY,
>>>>>>> Stashed changes
};
const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional);