From e39c8afbf269d5ce4bfe4b780c1bdfe973d956df Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sun, 26 Nov 2017 23:10:49 +0100
Subject: [PATCH] Rename all files in data/pokedex/entries/

Some people suggested this would be a good idea, and make management of
the files easier. I'm inclined to agree.
---
 data/pokedex/entries/{063.asm => abra.asm}    |   0
 .../entries/{142.asm => aerodactyl.asm}       |   0
 data/pokedex/entries/{190.asm => aipom.asm}   |   0
 .../pokedex/entries/{065.asm => alakazam.asm} |   0
 .../pokedex/entries/{181.asm => ampharos.asm} |   0
 data/pokedex/entries/{024.asm => arbok.asm}   |   0
 .../pokedex/entries/{059.asm => arcanine.asm} |   0
 data/pokedex/entries/{168.asm => ariados.asm} |   0
 .../pokedex/entries/{144.asm => articuno.asm} |   0
 .../entries/{184.asm => azumarill.asm}        |   0
 data/pokedex/entries/{153.asm => bayleef.asm} |   0
 .../pokedex/entries/{015.asm => beedrill.asm} |   0
 .../entries/{182.asm => bellossom.asm}        |   0
 .../entries/{069.asm => bellsprout.asm}       |   0
 .../entries/{009.asm => blastoise.asm}        |   0
 data/pokedex/entries/{242.asm => blissey.asm} |   0
 .../entries/{001.asm => bulbasaur.asm}        |   0
 .../entries/{012.asm => butterfree.asm}       |   0
 .../pokedex/entries/{010.asm => caterpie.asm} |   0
 data/pokedex/entries/{251.asm => celebi.asm}  |   0
 data/pokedex/entries/{113.asm => chansey.asm} |   0
 .../entries/{006.asm => charizard.asm}        |   0
 .../entries/{004.asm => charmander.asm}       |   0
 .../entries/{005.asm => charmeleon.asm}       |   0
 .../entries/{152.asm => chikorita.asm}        |   0
 .../pokedex/entries/{170.asm => chinchou.asm} |   0
 .../pokedex/entries/{036.asm => clefable.asm} |   0
 .../pokedex/entries/{035.asm => clefairy.asm} |   0
 data/pokedex/entries/{173.asm => cleffa.asm}  |   0
 .../pokedex/entries/{091.asm => cloyster.asm} |   0
 data/pokedex/entries/{222.asm => corsola.asm} |   0
 data/pokedex/entries/{169.asm => crobat.asm}  |   0
 .../pokedex/entries/{159.asm => croconaw.asm} |   0
 data/pokedex/entries/{104.asm => cubone.asm}  |   0
 .../entries/{155.asm => cyndaquil.asm}        |   0
 .../pokedex/entries/{225.asm => delibird.asm} |   0
 data/pokedex/entries/{087.asm => dewgong.asm} |   0
 data/pokedex/entries/{050.asm => diglett.asm} |   0
 data/pokedex/entries/{132.asm => ditto.asm}   |   0
 data/pokedex/entries/{085.asm => dodrio.asm}  |   0
 data/pokedex/entries/{084.asm => doduo.asm}   |   0
 data/pokedex/entries/{232.asm => donphan.asm} |   0
 .../entries/{148.asm => dragonair.asm}        |   0
 .../entries/{149.asm => dragonite.asm}        |   0
 data/pokedex/entries/{147.asm => dratini.asm} |   0
 data/pokedex/entries/{096.asm => drowzee.asm} |   0
 data/pokedex/entries/{051.asm => dugtrio.asm} |   0
 .../entries/{206.asm => dunsparce.asm}        |   0
 data/pokedex/entries/{133.asm => eevee.asm}   |   0
 data/pokedex/entries/{023.asm => ekans.asm}   |   0
 .../entries/{125.asm => electabuzz.asm}       |   0
 .../entries/{101.asm => electrode.asm}        |   0
 data/pokedex/entries/{239.asm => elekid.asm}  |   0
 data/pokedex/entries/{244.asm => entei.asm}   |   0
 data/pokedex/entries/{196.asm => espeon.asm}  |   0
 .../entries/{102.asm => exeggcute.asm}        |   0
 .../entries/{103.asm => exeggutor.asm}        |   0
 .../entries/{083.asm => farfetch_d.asm}       |   0
 data/pokedex/entries/{022.asm => fearow.asm}  |   0
 .../entries/{160.asm => feraligatr.asm}       |   0
 data/pokedex/entries/{180.asm => flaaffy.asm} |   0
 data/pokedex/entries/{136.asm => flareon.asm} |   0
 .../entries/{205.asm => forretress.asm}       |   0
 data/pokedex/entries/{162.asm => furret.asm}  |   0
 data/pokedex/entries/{092.asm => gastly.asm}  |   0
 data/pokedex/entries/{094.asm => gengar.asm}  |   0
 data/pokedex/entries/{074.asm => geodude.asm} |   0
 .../entries/{203.asm => girafarig.asm}        |   0
 data/pokedex/entries/{207.asm => gligar.asm}  |   0
 data/pokedex/entries/{044.asm => gloom.asm}   |   0
 data/pokedex/entries/{042.asm => golbat.asm}  |   0
 data/pokedex/entries/{118.asm => goldeen.asm} |   0
 data/pokedex/entries/{055.asm => golduck.asm} |   0
 data/pokedex/entries/{076.asm => golem.asm}   |   0
 .../pokedex/entries/{210.asm => granbull.asm} |   0
 .../pokedex/entries/{075.asm => graveler.asm} |   0
 data/pokedex/entries/{088.asm => grimer.asm}  |   0
 .../entries/{058.asm => growlithe.asm}        |   0
 .../pokedex/entries/{130.asm => gyarados.asm} |   0
 data/pokedex/entries/{093.asm => haunter.asm} |   0
 .../entries/{214.asm => heracross.asm}        |   0
 .../entries/{107.asm => hitmonchan.asm}       |   0
 .../entries/{106.asm => hitmonlee.asm}        |   0
 .../entries/{237.asm => hitmontop.asm}        |   0
 data/pokedex/entries/{250.asm => ho_oh.asm}   |   0
 .../pokedex/entries/{163.asm => hoothoot.asm} |   0
 data/pokedex/entries/{187.asm => hoppip.asm}  |   0
 data/pokedex/entries/{116.asm => horsea.asm}  |   0
 .../pokedex/entries/{229.asm => houndoom.asm} |   0
 .../pokedex/entries/{228.asm => houndour.asm} |   0
 data/pokedex/entries/{097.asm => hypno.asm}   |   0
 .../entries/{174.asm => igglybuff.asm}        |   0
 data/pokedex/entries/{002.asm => ivysaur.asm} |   0
 .../entries/{039.asm => jigglypuff.asm}       |   0
 data/pokedex/entries/{135.asm => jolteon.asm} |   0
 .../pokedex/entries/{189.asm => jumpluff.asm} |   0
 data/pokedex/entries/{124.asm => jynx.asm}    |   0
 data/pokedex/entries/{140.asm => kabuto.asm}  |   0
 .../pokedex/entries/{141.asm => kabutops.asm} |   0
 data/pokedex/entries/{064.asm => kadabra.asm} |   0
 data/pokedex/entries/{014.asm => kakuna.asm}  |   0
 .../entries/{115.asm => kangaskhan.asm}       |   0
 data/pokedex/entries/{230.asm => kingdra.asm} |   0
 data/pokedex/entries/{099.asm => kingler.asm} |   0
 data/pokedex/entries/{109.asm => koffing.asm} |   0
 data/pokedex/entries/{098.asm => krabby.asm}  |   0
 data/pokedex/entries/{171.asm => lanturn.asm} |   0
 data/pokedex/entries/{131.asm => lapras.asm}  |   0
 .../pokedex/entries/{246.asm => larvitar.asm} |   0
 data/pokedex/entries/{166.asm => ledian.asm}  |   0
 data/pokedex/entries/{165.asm => ledyba.asm}  |   0
 .../entries/{108.asm => lickitung.asm}        |   0
 data/pokedex/entries/{249.asm => lugia.asm}   |   0
 data/pokedex/entries/{068.asm => machamp.asm} |   0
 data/pokedex/entries/{067.asm => machoke.asm} |   0
 data/pokedex/entries/{066.asm => machop.asm}  |   0
 data/pokedex/entries/{240.asm => magby.asm}   |   0
 .../pokedex/entries/{219.asm => magcargo.asm} |   0
 .../pokedex/entries/{129.asm => magikarp.asm} |   0
 data/pokedex/entries/{126.asm => magmar.asm}  |   0
 .../entries/{081.asm => magnemite.asm}        |   0
 .../pokedex/entries/{082.asm => magneton.asm} |   0
 data/pokedex/entries/{056.asm => mankey.asm}  |   0
 data/pokedex/entries/{226.asm => mantine.asm} |   0
 data/pokedex/entries/{179.asm => mareep.asm}  |   0
 data/pokedex/entries/{183.asm => marill.asm}  |   0
 data/pokedex/entries/{105.asm => marowak.asm} |   0
 .../pokedex/entries/{154.asm => meganium.asm} |   0
 data/pokedex/entries/{052.asm => meowth.asm}  |   0
 data/pokedex/entries/{011.asm => metapod.asm} |   0
 data/pokedex/entries/{151.asm => mew.asm}     |   0
 data/pokedex/entries/{150.asm => mewtwo.asm}  |   0
 data/pokedex/entries/{241.asm => miltank.asm} |   0
 .../entries/{200.asm => misdreavus.asm}       |   0
 data/pokedex/entries/{146.asm => moltres.asm} |   0
 .../pokedex/entries/{122.asm => mr__mime.asm} |   0
 data/pokedex/entries/{089.asm => muk.asm}     |   0
 data/pokedex/entries/{198.asm => murkrow.asm} |   0
 data/pokedex/entries/{177.asm => natu.asm}    |   0
 .../pokedex/entries/{034.asm => nidoking.asm} |   0
 .../entries/{031.asm => nidoqueen.asm}        |   0
 .../entries/{029.asm => nidoran_f.asm}        |   0
 .../entries/{032.asm => nidoran_m.asm}        |   0
 .../pokedex/entries/{030.asm => nidorina.asm} |   0
 .../pokedex/entries/{033.asm => nidorino.asm} |   0
 .../entries/{038.asm => ninetales.asm}        |   0
 data/pokedex/entries/{164.asm => noctowl.asm} |   0
 .../entries/{224.asm => octillery.asm}        |   0
 data/pokedex/entries/{043.asm => oddish.asm}  |   0
 data/pokedex/entries/{138.asm => omanyte.asm} |   0
 data/pokedex/entries/{139.asm => omastar.asm} |   0
 data/pokedex/entries/{095.asm => onix.asm}    |   0
 data/pokedex/entries/{046.asm => paras.asm}   |   0
 .../pokedex/entries/{047.asm => parasect.asm} |   0
 data/pokedex/entries/{053.asm => persian.asm} |   0
 data/pokedex/entries/{231.asm => phanpy.asm}  |   0
 data/pokedex/entries/{172.asm => pichu.asm}   |   0
 data/pokedex/entries/{018.asm => pidgeot.asm} |   0
 .../entries/{017.asm => pidgeotto.asm}        |   0
 data/pokedex/entries/{016.asm => pidgey.asm}  |   0
 data/pokedex/entries/{025.asm => pikachu.asm} |   0
 .../entries/{221.asm => piloswine.asm}        |   0
 data/pokedex/entries/{204.asm => pineco.asm}  |   0
 data/pokedex/entries/{127.asm => pinsir.asm}  |   0
 .../pokedex/entries/{186.asm => politoed.asm} |   0
 data/pokedex/entries/{060.asm => poliwag.asm} |   0
 .../entries/{061.asm => poliwhirl.asm}        |   0
 .../entries/{062.asm => poliwrath.asm}        |   0
 data/pokedex/entries/{077.asm => ponyta.asm}  |   0
 data/pokedex/entries/{137.asm => porygon.asm} |   0
 .../pokedex/entries/{233.asm => porygon2.asm} |   0
 .../pokedex/entries/{057.asm => primeape.asm} |   0
 data/pokedex/entries/{054.asm => psyduck.asm} |   0
 data/pokedex/entries/{247.asm => pupitar.asm} |   0
 .../pokedex/entries/{195.asm => quagsire.asm} |   0
 data/pokedex/entries/{156.asm => quilava.asm} |   0
 .../pokedex/entries/{211.asm => qwilfish.asm} |   0
 data/pokedex/entries/{026.asm => raichu.asm}  |   0
 data/pokedex/entries/{243.asm => raikou.asm}  |   0
 .../pokedex/entries/{078.asm => rapidash.asm} |   0
 .../pokedex/entries/{020.asm => raticate.asm} |   0
 data/pokedex/entries/{019.asm => rattata.asm} |   0
 .../pokedex/entries/{223.asm => remoraid.asm} |   0
 data/pokedex/entries/{112.asm => rhydon.asm}  |   0
 data/pokedex/entries/{111.asm => rhyhorn.asm} |   0
 .../entries/{027.asm => sandshrew.asm}        |   0
 .../entries/{028.asm => sandslash.asm}        |   0
 data/pokedex/entries/{212.asm => scizor.asm}  |   0
 data/pokedex/entries/{123.asm => scyther.asm} |   0
 data/pokedex/entries/{117.asm => seadra.asm}  |   0
 data/pokedex/entries/{119.asm => seaking.asm} |   0
 data/pokedex/entries/{086.asm => seel.asm}    |   0
 data/pokedex/entries/{161.asm => sentret.asm} |   0
 .../pokedex/entries/{090.asm => shellder.asm} |   0
 data/pokedex/entries/{213.asm => shuckle.asm} |   0
 .../pokedex/entries/{227.asm => skarmory.asm} |   0
 .../pokedex/entries/{188.asm => skiploom.asm} |   0
 data/pokedex/entries/{080.asm => slowbro.asm} |   0
 .../pokedex/entries/{199.asm => slowking.asm} |   0
 .../pokedex/entries/{079.asm => slowpoke.asm} |   0
 data/pokedex/entries/{218.asm => slugma.asm}  |   0
 .../pokedex/entries/{235.asm => smeargle.asm} |   0
 .../pokedex/entries/{238.asm => smoochum.asm} |   0
 data/pokedex/entries/{215.asm => sneasel.asm} |   0
 data/pokedex/entries/{143.asm => snorlax.asm} |   0
 .../pokedex/entries/{209.asm => snubbull.asm} |   0
 data/pokedex/entries/{021.asm => spearow.asm} |   0
 .../pokedex/entries/{167.asm => spinarak.asm} |   0
 .../pokedex/entries/{007.asm => squirtle.asm} |   0
 .../pokedex/entries/{234.asm => stantler.asm} |   0
 data/pokedex/entries/{121.asm => starmie.asm} |   0
 data/pokedex/entries/{120.asm => staryu.asm}  |   0
 data/pokedex/entries/{208.asm => steelix.asm} |   0
 .../entries/{185.asm => sudowoodo.asm}        |   0
 data/pokedex/entries/{245.asm => suicune.asm} |   0
 .../pokedex/entries/{192.asm => sunflora.asm} |   0
 data/pokedex/entries/{191.asm => sunkern.asm} |   0
 data/pokedex/entries/{220.asm => swinub.asm}  |   0
 data/pokedex/entries/{114.asm => tangela.asm} |   0
 data/pokedex/entries/{128.asm => tauros.asm}  |   0
 .../entries/{216.asm => teddiursa.asm}        |   0
 .../entries/{072.asm => tentacool.asm}        |   0
 .../entries/{073.asm => tentacruel.asm}       |   0
 data/pokedex/entries/{175.asm => togepi.asm}  |   0
 data/pokedex/entries/{176.asm => togetic.asm} |   0
 .../pokedex/entries/{158.asm => totodile.asm} |   0
 .../entries/{157.asm => typhlosion.asm}       |   0
 .../entries/{248.asm => tyranitar.asm}        |   0
 data/pokedex/entries/{236.asm => tyrogue.asm} |   0
 data/pokedex/entries/{197.asm => umbreon.asm} |   0
 data/pokedex/entries/{201.asm => unown.asm}   |   0
 .../pokedex/entries/{217.asm => ursaring.asm} |   0
 .../pokedex/entries/{134.asm => vaporeon.asm} |   0
 .../pokedex/entries/{049.asm => venomoth.asm} |   0
 data/pokedex/entries/{048.asm => venonat.asm} |   0
 .../pokedex/entries/{003.asm => venusaur.asm} |   0
 .../entries/{071.asm => victreebel.asm}       |   0
 .../entries/{045.asm => vileplume.asm}        |   0
 data/pokedex/entries/{100.asm => voltorb.asm} |   0
 data/pokedex/entries/{037.asm => vulpix.asm}  |   0
 .../entries/{008.asm => wartortle.asm}        |   0
 data/pokedex/entries/{013.asm => weedle.asm}  |   0
 .../entries/{070.asm => weepinbell.asm}       |   0
 data/pokedex/entries/{110.asm => weezing.asm} |   0
 .../entries/{040.asm => wigglytuff.asm}       |   0
 .../entries/{202.asm => wobbuffet.asm}        |   0
 data/pokedex/entries/{194.asm => wooper.asm}  |   0
 data/pokedex/entries/{178.asm => xatu.asm}    |   0
 data/pokedex/entries/{193.asm => yanma.asm}   |   0
 data/pokedex/entries/{145.asm => zapdos.asm}  |   0
 data/pokedex/entries/{041.asm => zubat.asm}   |   0
 data/pokedex/entries_1.asm                    | 128 +++++++++---------
 data/pokedex/entries_2.asm                    | 128 +++++++++---------
 data/pokedex/entries_3.asm                    | 128 +++++++++---------
 data/pokedex/entries_4.asm                    | 118 ++++++++--------
 255 files changed, 251 insertions(+), 251 deletions(-)
 rename data/pokedex/entries/{063.asm => abra.asm} (100%)
 rename data/pokedex/entries/{142.asm => aerodactyl.asm} (100%)
 rename data/pokedex/entries/{190.asm => aipom.asm} (100%)
 rename data/pokedex/entries/{065.asm => alakazam.asm} (100%)
 rename data/pokedex/entries/{181.asm => ampharos.asm} (100%)
 rename data/pokedex/entries/{024.asm => arbok.asm} (100%)
 rename data/pokedex/entries/{059.asm => arcanine.asm} (100%)
 rename data/pokedex/entries/{168.asm => ariados.asm} (100%)
 rename data/pokedex/entries/{144.asm => articuno.asm} (100%)
 rename data/pokedex/entries/{184.asm => azumarill.asm} (100%)
 rename data/pokedex/entries/{153.asm => bayleef.asm} (100%)
 rename data/pokedex/entries/{015.asm => beedrill.asm} (100%)
 rename data/pokedex/entries/{182.asm => bellossom.asm} (100%)
 rename data/pokedex/entries/{069.asm => bellsprout.asm} (100%)
 rename data/pokedex/entries/{009.asm => blastoise.asm} (100%)
 rename data/pokedex/entries/{242.asm => blissey.asm} (100%)
 rename data/pokedex/entries/{001.asm => bulbasaur.asm} (100%)
 rename data/pokedex/entries/{012.asm => butterfree.asm} (100%)
 rename data/pokedex/entries/{010.asm => caterpie.asm} (100%)
 rename data/pokedex/entries/{251.asm => celebi.asm} (100%)
 rename data/pokedex/entries/{113.asm => chansey.asm} (100%)
 rename data/pokedex/entries/{006.asm => charizard.asm} (100%)
 rename data/pokedex/entries/{004.asm => charmander.asm} (100%)
 rename data/pokedex/entries/{005.asm => charmeleon.asm} (100%)
 rename data/pokedex/entries/{152.asm => chikorita.asm} (100%)
 rename data/pokedex/entries/{170.asm => chinchou.asm} (100%)
 rename data/pokedex/entries/{036.asm => clefable.asm} (100%)
 rename data/pokedex/entries/{035.asm => clefairy.asm} (100%)
 rename data/pokedex/entries/{173.asm => cleffa.asm} (100%)
 rename data/pokedex/entries/{091.asm => cloyster.asm} (100%)
 rename data/pokedex/entries/{222.asm => corsola.asm} (100%)
 rename data/pokedex/entries/{169.asm => crobat.asm} (100%)
 rename data/pokedex/entries/{159.asm => croconaw.asm} (100%)
 rename data/pokedex/entries/{104.asm => cubone.asm} (100%)
 rename data/pokedex/entries/{155.asm => cyndaquil.asm} (100%)
 rename data/pokedex/entries/{225.asm => delibird.asm} (100%)
 rename data/pokedex/entries/{087.asm => dewgong.asm} (100%)
 rename data/pokedex/entries/{050.asm => diglett.asm} (100%)
 rename data/pokedex/entries/{132.asm => ditto.asm} (100%)
 rename data/pokedex/entries/{085.asm => dodrio.asm} (100%)
 rename data/pokedex/entries/{084.asm => doduo.asm} (100%)
 rename data/pokedex/entries/{232.asm => donphan.asm} (100%)
 rename data/pokedex/entries/{148.asm => dragonair.asm} (100%)
 rename data/pokedex/entries/{149.asm => dragonite.asm} (100%)
 rename data/pokedex/entries/{147.asm => dratini.asm} (100%)
 rename data/pokedex/entries/{096.asm => drowzee.asm} (100%)
 rename data/pokedex/entries/{051.asm => dugtrio.asm} (100%)
 rename data/pokedex/entries/{206.asm => dunsparce.asm} (100%)
 rename data/pokedex/entries/{133.asm => eevee.asm} (100%)
 rename data/pokedex/entries/{023.asm => ekans.asm} (100%)
 rename data/pokedex/entries/{125.asm => electabuzz.asm} (100%)
 rename data/pokedex/entries/{101.asm => electrode.asm} (100%)
 rename data/pokedex/entries/{239.asm => elekid.asm} (100%)
 rename data/pokedex/entries/{244.asm => entei.asm} (100%)
 rename data/pokedex/entries/{196.asm => espeon.asm} (100%)
 rename data/pokedex/entries/{102.asm => exeggcute.asm} (100%)
 rename data/pokedex/entries/{103.asm => exeggutor.asm} (100%)
 rename data/pokedex/entries/{083.asm => farfetch_d.asm} (100%)
 rename data/pokedex/entries/{022.asm => fearow.asm} (100%)
 rename data/pokedex/entries/{160.asm => feraligatr.asm} (100%)
 rename data/pokedex/entries/{180.asm => flaaffy.asm} (100%)
 rename data/pokedex/entries/{136.asm => flareon.asm} (100%)
 rename data/pokedex/entries/{205.asm => forretress.asm} (100%)
 rename data/pokedex/entries/{162.asm => furret.asm} (100%)
 rename data/pokedex/entries/{092.asm => gastly.asm} (100%)
 rename data/pokedex/entries/{094.asm => gengar.asm} (100%)
 rename data/pokedex/entries/{074.asm => geodude.asm} (100%)
 rename data/pokedex/entries/{203.asm => girafarig.asm} (100%)
 rename data/pokedex/entries/{207.asm => gligar.asm} (100%)
 rename data/pokedex/entries/{044.asm => gloom.asm} (100%)
 rename data/pokedex/entries/{042.asm => golbat.asm} (100%)
 rename data/pokedex/entries/{118.asm => goldeen.asm} (100%)
 rename data/pokedex/entries/{055.asm => golduck.asm} (100%)
 rename data/pokedex/entries/{076.asm => golem.asm} (100%)
 rename data/pokedex/entries/{210.asm => granbull.asm} (100%)
 rename data/pokedex/entries/{075.asm => graveler.asm} (100%)
 rename data/pokedex/entries/{088.asm => grimer.asm} (100%)
 rename data/pokedex/entries/{058.asm => growlithe.asm} (100%)
 rename data/pokedex/entries/{130.asm => gyarados.asm} (100%)
 rename data/pokedex/entries/{093.asm => haunter.asm} (100%)
 rename data/pokedex/entries/{214.asm => heracross.asm} (100%)
 rename data/pokedex/entries/{107.asm => hitmonchan.asm} (100%)
 rename data/pokedex/entries/{106.asm => hitmonlee.asm} (100%)
 rename data/pokedex/entries/{237.asm => hitmontop.asm} (100%)
 rename data/pokedex/entries/{250.asm => ho_oh.asm} (100%)
 rename data/pokedex/entries/{163.asm => hoothoot.asm} (100%)
 rename data/pokedex/entries/{187.asm => hoppip.asm} (100%)
 rename data/pokedex/entries/{116.asm => horsea.asm} (100%)
 rename data/pokedex/entries/{229.asm => houndoom.asm} (100%)
 rename data/pokedex/entries/{228.asm => houndour.asm} (100%)
 rename data/pokedex/entries/{097.asm => hypno.asm} (100%)
 rename data/pokedex/entries/{174.asm => igglybuff.asm} (100%)
 rename data/pokedex/entries/{002.asm => ivysaur.asm} (100%)
 rename data/pokedex/entries/{039.asm => jigglypuff.asm} (100%)
 rename data/pokedex/entries/{135.asm => jolteon.asm} (100%)
 rename data/pokedex/entries/{189.asm => jumpluff.asm} (100%)
 rename data/pokedex/entries/{124.asm => jynx.asm} (100%)
 rename data/pokedex/entries/{140.asm => kabuto.asm} (100%)
 rename data/pokedex/entries/{141.asm => kabutops.asm} (100%)
 rename data/pokedex/entries/{064.asm => kadabra.asm} (100%)
 rename data/pokedex/entries/{014.asm => kakuna.asm} (100%)
 rename data/pokedex/entries/{115.asm => kangaskhan.asm} (100%)
 rename data/pokedex/entries/{230.asm => kingdra.asm} (100%)
 rename data/pokedex/entries/{099.asm => kingler.asm} (100%)
 rename data/pokedex/entries/{109.asm => koffing.asm} (100%)
 rename data/pokedex/entries/{098.asm => krabby.asm} (100%)
 rename data/pokedex/entries/{171.asm => lanturn.asm} (100%)
 rename data/pokedex/entries/{131.asm => lapras.asm} (100%)
 rename data/pokedex/entries/{246.asm => larvitar.asm} (100%)
 rename data/pokedex/entries/{166.asm => ledian.asm} (100%)
 rename data/pokedex/entries/{165.asm => ledyba.asm} (100%)
 rename data/pokedex/entries/{108.asm => lickitung.asm} (100%)
 rename data/pokedex/entries/{249.asm => lugia.asm} (100%)
 rename data/pokedex/entries/{068.asm => machamp.asm} (100%)
 rename data/pokedex/entries/{067.asm => machoke.asm} (100%)
 rename data/pokedex/entries/{066.asm => machop.asm} (100%)
 rename data/pokedex/entries/{240.asm => magby.asm} (100%)
 rename data/pokedex/entries/{219.asm => magcargo.asm} (100%)
 rename data/pokedex/entries/{129.asm => magikarp.asm} (100%)
 rename data/pokedex/entries/{126.asm => magmar.asm} (100%)
 rename data/pokedex/entries/{081.asm => magnemite.asm} (100%)
 rename data/pokedex/entries/{082.asm => magneton.asm} (100%)
 rename data/pokedex/entries/{056.asm => mankey.asm} (100%)
 rename data/pokedex/entries/{226.asm => mantine.asm} (100%)
 rename data/pokedex/entries/{179.asm => mareep.asm} (100%)
 rename data/pokedex/entries/{183.asm => marill.asm} (100%)
 rename data/pokedex/entries/{105.asm => marowak.asm} (100%)
 rename data/pokedex/entries/{154.asm => meganium.asm} (100%)
 rename data/pokedex/entries/{052.asm => meowth.asm} (100%)
 rename data/pokedex/entries/{011.asm => metapod.asm} (100%)
 rename data/pokedex/entries/{151.asm => mew.asm} (100%)
 rename data/pokedex/entries/{150.asm => mewtwo.asm} (100%)
 rename data/pokedex/entries/{241.asm => miltank.asm} (100%)
 rename data/pokedex/entries/{200.asm => misdreavus.asm} (100%)
 rename data/pokedex/entries/{146.asm => moltres.asm} (100%)
 rename data/pokedex/entries/{122.asm => mr__mime.asm} (100%)
 rename data/pokedex/entries/{089.asm => muk.asm} (100%)
 rename data/pokedex/entries/{198.asm => murkrow.asm} (100%)
 rename data/pokedex/entries/{177.asm => natu.asm} (100%)
 rename data/pokedex/entries/{034.asm => nidoking.asm} (100%)
 rename data/pokedex/entries/{031.asm => nidoqueen.asm} (100%)
 rename data/pokedex/entries/{029.asm => nidoran_f.asm} (100%)
 rename data/pokedex/entries/{032.asm => nidoran_m.asm} (100%)
 rename data/pokedex/entries/{030.asm => nidorina.asm} (100%)
 rename data/pokedex/entries/{033.asm => nidorino.asm} (100%)
 rename data/pokedex/entries/{038.asm => ninetales.asm} (100%)
 rename data/pokedex/entries/{164.asm => noctowl.asm} (100%)
 rename data/pokedex/entries/{224.asm => octillery.asm} (100%)
 rename data/pokedex/entries/{043.asm => oddish.asm} (100%)
 rename data/pokedex/entries/{138.asm => omanyte.asm} (100%)
 rename data/pokedex/entries/{139.asm => omastar.asm} (100%)
 rename data/pokedex/entries/{095.asm => onix.asm} (100%)
 rename data/pokedex/entries/{046.asm => paras.asm} (100%)
 rename data/pokedex/entries/{047.asm => parasect.asm} (100%)
 rename data/pokedex/entries/{053.asm => persian.asm} (100%)
 rename data/pokedex/entries/{231.asm => phanpy.asm} (100%)
 rename data/pokedex/entries/{172.asm => pichu.asm} (100%)
 rename data/pokedex/entries/{018.asm => pidgeot.asm} (100%)
 rename data/pokedex/entries/{017.asm => pidgeotto.asm} (100%)
 rename data/pokedex/entries/{016.asm => pidgey.asm} (100%)
 rename data/pokedex/entries/{025.asm => pikachu.asm} (100%)
 rename data/pokedex/entries/{221.asm => piloswine.asm} (100%)
 rename data/pokedex/entries/{204.asm => pineco.asm} (100%)
 rename data/pokedex/entries/{127.asm => pinsir.asm} (100%)
 rename data/pokedex/entries/{186.asm => politoed.asm} (100%)
 rename data/pokedex/entries/{060.asm => poliwag.asm} (100%)
 rename data/pokedex/entries/{061.asm => poliwhirl.asm} (100%)
 rename data/pokedex/entries/{062.asm => poliwrath.asm} (100%)
 rename data/pokedex/entries/{077.asm => ponyta.asm} (100%)
 rename data/pokedex/entries/{137.asm => porygon.asm} (100%)
 rename data/pokedex/entries/{233.asm => porygon2.asm} (100%)
 rename data/pokedex/entries/{057.asm => primeape.asm} (100%)
 rename data/pokedex/entries/{054.asm => psyduck.asm} (100%)
 rename data/pokedex/entries/{247.asm => pupitar.asm} (100%)
 rename data/pokedex/entries/{195.asm => quagsire.asm} (100%)
 rename data/pokedex/entries/{156.asm => quilava.asm} (100%)
 rename data/pokedex/entries/{211.asm => qwilfish.asm} (100%)
 rename data/pokedex/entries/{026.asm => raichu.asm} (100%)
 rename data/pokedex/entries/{243.asm => raikou.asm} (100%)
 rename data/pokedex/entries/{078.asm => rapidash.asm} (100%)
 rename data/pokedex/entries/{020.asm => raticate.asm} (100%)
 rename data/pokedex/entries/{019.asm => rattata.asm} (100%)
 rename data/pokedex/entries/{223.asm => remoraid.asm} (100%)
 rename data/pokedex/entries/{112.asm => rhydon.asm} (100%)
 rename data/pokedex/entries/{111.asm => rhyhorn.asm} (100%)
 rename data/pokedex/entries/{027.asm => sandshrew.asm} (100%)
 rename data/pokedex/entries/{028.asm => sandslash.asm} (100%)
 rename data/pokedex/entries/{212.asm => scizor.asm} (100%)
 rename data/pokedex/entries/{123.asm => scyther.asm} (100%)
 rename data/pokedex/entries/{117.asm => seadra.asm} (100%)
 rename data/pokedex/entries/{119.asm => seaking.asm} (100%)
 rename data/pokedex/entries/{086.asm => seel.asm} (100%)
 rename data/pokedex/entries/{161.asm => sentret.asm} (100%)
 rename data/pokedex/entries/{090.asm => shellder.asm} (100%)
 rename data/pokedex/entries/{213.asm => shuckle.asm} (100%)
 rename data/pokedex/entries/{227.asm => skarmory.asm} (100%)
 rename data/pokedex/entries/{188.asm => skiploom.asm} (100%)
 rename data/pokedex/entries/{080.asm => slowbro.asm} (100%)
 rename data/pokedex/entries/{199.asm => slowking.asm} (100%)
 rename data/pokedex/entries/{079.asm => slowpoke.asm} (100%)
 rename data/pokedex/entries/{218.asm => slugma.asm} (100%)
 rename data/pokedex/entries/{235.asm => smeargle.asm} (100%)
 rename data/pokedex/entries/{238.asm => smoochum.asm} (100%)
 rename data/pokedex/entries/{215.asm => sneasel.asm} (100%)
 rename data/pokedex/entries/{143.asm => snorlax.asm} (100%)
 rename data/pokedex/entries/{209.asm => snubbull.asm} (100%)
 rename data/pokedex/entries/{021.asm => spearow.asm} (100%)
 rename data/pokedex/entries/{167.asm => spinarak.asm} (100%)
 rename data/pokedex/entries/{007.asm => squirtle.asm} (100%)
 rename data/pokedex/entries/{234.asm => stantler.asm} (100%)
 rename data/pokedex/entries/{121.asm => starmie.asm} (100%)
 rename data/pokedex/entries/{120.asm => staryu.asm} (100%)
 rename data/pokedex/entries/{208.asm => steelix.asm} (100%)
 rename data/pokedex/entries/{185.asm => sudowoodo.asm} (100%)
 rename data/pokedex/entries/{245.asm => suicune.asm} (100%)
 rename data/pokedex/entries/{192.asm => sunflora.asm} (100%)
 rename data/pokedex/entries/{191.asm => sunkern.asm} (100%)
 rename data/pokedex/entries/{220.asm => swinub.asm} (100%)
 rename data/pokedex/entries/{114.asm => tangela.asm} (100%)
 rename data/pokedex/entries/{128.asm => tauros.asm} (100%)
 rename data/pokedex/entries/{216.asm => teddiursa.asm} (100%)
 rename data/pokedex/entries/{072.asm => tentacool.asm} (100%)
 rename data/pokedex/entries/{073.asm => tentacruel.asm} (100%)
 rename data/pokedex/entries/{175.asm => togepi.asm} (100%)
 rename data/pokedex/entries/{176.asm => togetic.asm} (100%)
 rename data/pokedex/entries/{158.asm => totodile.asm} (100%)
 rename data/pokedex/entries/{157.asm => typhlosion.asm} (100%)
 rename data/pokedex/entries/{248.asm => tyranitar.asm} (100%)
 rename data/pokedex/entries/{236.asm => tyrogue.asm} (100%)
 rename data/pokedex/entries/{197.asm => umbreon.asm} (100%)
 rename data/pokedex/entries/{201.asm => unown.asm} (100%)
 rename data/pokedex/entries/{217.asm => ursaring.asm} (100%)
 rename data/pokedex/entries/{134.asm => vaporeon.asm} (100%)
 rename data/pokedex/entries/{049.asm => venomoth.asm} (100%)
 rename data/pokedex/entries/{048.asm => venonat.asm} (100%)
 rename data/pokedex/entries/{003.asm => venusaur.asm} (100%)
 rename data/pokedex/entries/{071.asm => victreebel.asm} (100%)
 rename data/pokedex/entries/{045.asm => vileplume.asm} (100%)
 rename data/pokedex/entries/{100.asm => voltorb.asm} (100%)
 rename data/pokedex/entries/{037.asm => vulpix.asm} (100%)
 rename data/pokedex/entries/{008.asm => wartortle.asm} (100%)
 rename data/pokedex/entries/{013.asm => weedle.asm} (100%)
 rename data/pokedex/entries/{070.asm => weepinbell.asm} (100%)
 rename data/pokedex/entries/{110.asm => weezing.asm} (100%)
 rename data/pokedex/entries/{040.asm => wigglytuff.asm} (100%)
 rename data/pokedex/entries/{202.asm => wobbuffet.asm} (100%)
 rename data/pokedex/entries/{194.asm => wooper.asm} (100%)
 rename data/pokedex/entries/{178.asm => xatu.asm} (100%)
 rename data/pokedex/entries/{193.asm => yanma.asm} (100%)
 rename data/pokedex/entries/{145.asm => zapdos.asm} (100%)
 rename data/pokedex/entries/{041.asm => zubat.asm} (100%)

diff --git a/data/pokedex/entries/063.asm b/data/pokedex/entries/abra.asm
similarity index 100%
rename from data/pokedex/entries/063.asm
rename to data/pokedex/entries/abra.asm
diff --git a/data/pokedex/entries/142.asm b/data/pokedex/entries/aerodactyl.asm
similarity index 100%
rename from data/pokedex/entries/142.asm
rename to data/pokedex/entries/aerodactyl.asm
diff --git a/data/pokedex/entries/190.asm b/data/pokedex/entries/aipom.asm
similarity index 100%
rename from data/pokedex/entries/190.asm
rename to data/pokedex/entries/aipom.asm
diff --git a/data/pokedex/entries/065.asm b/data/pokedex/entries/alakazam.asm
similarity index 100%
rename from data/pokedex/entries/065.asm
rename to data/pokedex/entries/alakazam.asm
diff --git a/data/pokedex/entries/181.asm b/data/pokedex/entries/ampharos.asm
similarity index 100%
rename from data/pokedex/entries/181.asm
rename to data/pokedex/entries/ampharos.asm
diff --git a/data/pokedex/entries/024.asm b/data/pokedex/entries/arbok.asm
similarity index 100%
rename from data/pokedex/entries/024.asm
rename to data/pokedex/entries/arbok.asm
diff --git a/data/pokedex/entries/059.asm b/data/pokedex/entries/arcanine.asm
similarity index 100%
rename from data/pokedex/entries/059.asm
rename to data/pokedex/entries/arcanine.asm
diff --git a/data/pokedex/entries/168.asm b/data/pokedex/entries/ariados.asm
similarity index 100%
rename from data/pokedex/entries/168.asm
rename to data/pokedex/entries/ariados.asm
diff --git a/data/pokedex/entries/144.asm b/data/pokedex/entries/articuno.asm
similarity index 100%
rename from data/pokedex/entries/144.asm
rename to data/pokedex/entries/articuno.asm
diff --git a/data/pokedex/entries/184.asm b/data/pokedex/entries/azumarill.asm
similarity index 100%
rename from data/pokedex/entries/184.asm
rename to data/pokedex/entries/azumarill.asm
diff --git a/data/pokedex/entries/153.asm b/data/pokedex/entries/bayleef.asm
similarity index 100%
rename from data/pokedex/entries/153.asm
rename to data/pokedex/entries/bayleef.asm
diff --git a/data/pokedex/entries/015.asm b/data/pokedex/entries/beedrill.asm
similarity index 100%
rename from data/pokedex/entries/015.asm
rename to data/pokedex/entries/beedrill.asm
diff --git a/data/pokedex/entries/182.asm b/data/pokedex/entries/bellossom.asm
similarity index 100%
rename from data/pokedex/entries/182.asm
rename to data/pokedex/entries/bellossom.asm
diff --git a/data/pokedex/entries/069.asm b/data/pokedex/entries/bellsprout.asm
similarity index 100%
rename from data/pokedex/entries/069.asm
rename to data/pokedex/entries/bellsprout.asm
diff --git a/data/pokedex/entries/009.asm b/data/pokedex/entries/blastoise.asm
similarity index 100%
rename from data/pokedex/entries/009.asm
rename to data/pokedex/entries/blastoise.asm
diff --git a/data/pokedex/entries/242.asm b/data/pokedex/entries/blissey.asm
similarity index 100%
rename from data/pokedex/entries/242.asm
rename to data/pokedex/entries/blissey.asm
diff --git a/data/pokedex/entries/001.asm b/data/pokedex/entries/bulbasaur.asm
similarity index 100%
rename from data/pokedex/entries/001.asm
rename to data/pokedex/entries/bulbasaur.asm
diff --git a/data/pokedex/entries/012.asm b/data/pokedex/entries/butterfree.asm
similarity index 100%
rename from data/pokedex/entries/012.asm
rename to data/pokedex/entries/butterfree.asm
diff --git a/data/pokedex/entries/010.asm b/data/pokedex/entries/caterpie.asm
similarity index 100%
rename from data/pokedex/entries/010.asm
rename to data/pokedex/entries/caterpie.asm
diff --git a/data/pokedex/entries/251.asm b/data/pokedex/entries/celebi.asm
similarity index 100%
rename from data/pokedex/entries/251.asm
rename to data/pokedex/entries/celebi.asm
diff --git a/data/pokedex/entries/113.asm b/data/pokedex/entries/chansey.asm
similarity index 100%
rename from data/pokedex/entries/113.asm
rename to data/pokedex/entries/chansey.asm
diff --git a/data/pokedex/entries/006.asm b/data/pokedex/entries/charizard.asm
similarity index 100%
rename from data/pokedex/entries/006.asm
rename to data/pokedex/entries/charizard.asm
diff --git a/data/pokedex/entries/004.asm b/data/pokedex/entries/charmander.asm
similarity index 100%
rename from data/pokedex/entries/004.asm
rename to data/pokedex/entries/charmander.asm
diff --git a/data/pokedex/entries/005.asm b/data/pokedex/entries/charmeleon.asm
similarity index 100%
rename from data/pokedex/entries/005.asm
rename to data/pokedex/entries/charmeleon.asm
diff --git a/data/pokedex/entries/152.asm b/data/pokedex/entries/chikorita.asm
similarity index 100%
rename from data/pokedex/entries/152.asm
rename to data/pokedex/entries/chikorita.asm
diff --git a/data/pokedex/entries/170.asm b/data/pokedex/entries/chinchou.asm
similarity index 100%
rename from data/pokedex/entries/170.asm
rename to data/pokedex/entries/chinchou.asm
diff --git a/data/pokedex/entries/036.asm b/data/pokedex/entries/clefable.asm
similarity index 100%
rename from data/pokedex/entries/036.asm
rename to data/pokedex/entries/clefable.asm
diff --git a/data/pokedex/entries/035.asm b/data/pokedex/entries/clefairy.asm
similarity index 100%
rename from data/pokedex/entries/035.asm
rename to data/pokedex/entries/clefairy.asm
diff --git a/data/pokedex/entries/173.asm b/data/pokedex/entries/cleffa.asm
similarity index 100%
rename from data/pokedex/entries/173.asm
rename to data/pokedex/entries/cleffa.asm
diff --git a/data/pokedex/entries/091.asm b/data/pokedex/entries/cloyster.asm
similarity index 100%
rename from data/pokedex/entries/091.asm
rename to data/pokedex/entries/cloyster.asm
diff --git a/data/pokedex/entries/222.asm b/data/pokedex/entries/corsola.asm
similarity index 100%
rename from data/pokedex/entries/222.asm
rename to data/pokedex/entries/corsola.asm
diff --git a/data/pokedex/entries/169.asm b/data/pokedex/entries/crobat.asm
similarity index 100%
rename from data/pokedex/entries/169.asm
rename to data/pokedex/entries/crobat.asm
diff --git a/data/pokedex/entries/159.asm b/data/pokedex/entries/croconaw.asm
similarity index 100%
rename from data/pokedex/entries/159.asm
rename to data/pokedex/entries/croconaw.asm
diff --git a/data/pokedex/entries/104.asm b/data/pokedex/entries/cubone.asm
similarity index 100%
rename from data/pokedex/entries/104.asm
rename to data/pokedex/entries/cubone.asm
diff --git a/data/pokedex/entries/155.asm b/data/pokedex/entries/cyndaquil.asm
similarity index 100%
rename from data/pokedex/entries/155.asm
rename to data/pokedex/entries/cyndaquil.asm
diff --git a/data/pokedex/entries/225.asm b/data/pokedex/entries/delibird.asm
similarity index 100%
rename from data/pokedex/entries/225.asm
rename to data/pokedex/entries/delibird.asm
diff --git a/data/pokedex/entries/087.asm b/data/pokedex/entries/dewgong.asm
similarity index 100%
rename from data/pokedex/entries/087.asm
rename to data/pokedex/entries/dewgong.asm
diff --git a/data/pokedex/entries/050.asm b/data/pokedex/entries/diglett.asm
similarity index 100%
rename from data/pokedex/entries/050.asm
rename to data/pokedex/entries/diglett.asm
diff --git a/data/pokedex/entries/132.asm b/data/pokedex/entries/ditto.asm
similarity index 100%
rename from data/pokedex/entries/132.asm
rename to data/pokedex/entries/ditto.asm
diff --git a/data/pokedex/entries/085.asm b/data/pokedex/entries/dodrio.asm
similarity index 100%
rename from data/pokedex/entries/085.asm
rename to data/pokedex/entries/dodrio.asm
diff --git a/data/pokedex/entries/084.asm b/data/pokedex/entries/doduo.asm
similarity index 100%
rename from data/pokedex/entries/084.asm
rename to data/pokedex/entries/doduo.asm
diff --git a/data/pokedex/entries/232.asm b/data/pokedex/entries/donphan.asm
similarity index 100%
rename from data/pokedex/entries/232.asm
rename to data/pokedex/entries/donphan.asm
diff --git a/data/pokedex/entries/148.asm b/data/pokedex/entries/dragonair.asm
similarity index 100%
rename from data/pokedex/entries/148.asm
rename to data/pokedex/entries/dragonair.asm
diff --git a/data/pokedex/entries/149.asm b/data/pokedex/entries/dragonite.asm
similarity index 100%
rename from data/pokedex/entries/149.asm
rename to data/pokedex/entries/dragonite.asm
diff --git a/data/pokedex/entries/147.asm b/data/pokedex/entries/dratini.asm
similarity index 100%
rename from data/pokedex/entries/147.asm
rename to data/pokedex/entries/dratini.asm
diff --git a/data/pokedex/entries/096.asm b/data/pokedex/entries/drowzee.asm
similarity index 100%
rename from data/pokedex/entries/096.asm
rename to data/pokedex/entries/drowzee.asm
diff --git a/data/pokedex/entries/051.asm b/data/pokedex/entries/dugtrio.asm
similarity index 100%
rename from data/pokedex/entries/051.asm
rename to data/pokedex/entries/dugtrio.asm
diff --git a/data/pokedex/entries/206.asm b/data/pokedex/entries/dunsparce.asm
similarity index 100%
rename from data/pokedex/entries/206.asm
rename to data/pokedex/entries/dunsparce.asm
diff --git a/data/pokedex/entries/133.asm b/data/pokedex/entries/eevee.asm
similarity index 100%
rename from data/pokedex/entries/133.asm
rename to data/pokedex/entries/eevee.asm
diff --git a/data/pokedex/entries/023.asm b/data/pokedex/entries/ekans.asm
similarity index 100%
rename from data/pokedex/entries/023.asm
rename to data/pokedex/entries/ekans.asm
diff --git a/data/pokedex/entries/125.asm b/data/pokedex/entries/electabuzz.asm
similarity index 100%
rename from data/pokedex/entries/125.asm
rename to data/pokedex/entries/electabuzz.asm
diff --git a/data/pokedex/entries/101.asm b/data/pokedex/entries/electrode.asm
similarity index 100%
rename from data/pokedex/entries/101.asm
rename to data/pokedex/entries/electrode.asm
diff --git a/data/pokedex/entries/239.asm b/data/pokedex/entries/elekid.asm
similarity index 100%
rename from data/pokedex/entries/239.asm
rename to data/pokedex/entries/elekid.asm
diff --git a/data/pokedex/entries/244.asm b/data/pokedex/entries/entei.asm
similarity index 100%
rename from data/pokedex/entries/244.asm
rename to data/pokedex/entries/entei.asm
diff --git a/data/pokedex/entries/196.asm b/data/pokedex/entries/espeon.asm
similarity index 100%
rename from data/pokedex/entries/196.asm
rename to data/pokedex/entries/espeon.asm
diff --git a/data/pokedex/entries/102.asm b/data/pokedex/entries/exeggcute.asm
similarity index 100%
rename from data/pokedex/entries/102.asm
rename to data/pokedex/entries/exeggcute.asm
diff --git a/data/pokedex/entries/103.asm b/data/pokedex/entries/exeggutor.asm
similarity index 100%
rename from data/pokedex/entries/103.asm
rename to data/pokedex/entries/exeggutor.asm
diff --git a/data/pokedex/entries/083.asm b/data/pokedex/entries/farfetch_d.asm
similarity index 100%
rename from data/pokedex/entries/083.asm
rename to data/pokedex/entries/farfetch_d.asm
diff --git a/data/pokedex/entries/022.asm b/data/pokedex/entries/fearow.asm
similarity index 100%
rename from data/pokedex/entries/022.asm
rename to data/pokedex/entries/fearow.asm
diff --git a/data/pokedex/entries/160.asm b/data/pokedex/entries/feraligatr.asm
similarity index 100%
rename from data/pokedex/entries/160.asm
rename to data/pokedex/entries/feraligatr.asm
diff --git a/data/pokedex/entries/180.asm b/data/pokedex/entries/flaaffy.asm
similarity index 100%
rename from data/pokedex/entries/180.asm
rename to data/pokedex/entries/flaaffy.asm
diff --git a/data/pokedex/entries/136.asm b/data/pokedex/entries/flareon.asm
similarity index 100%
rename from data/pokedex/entries/136.asm
rename to data/pokedex/entries/flareon.asm
diff --git a/data/pokedex/entries/205.asm b/data/pokedex/entries/forretress.asm
similarity index 100%
rename from data/pokedex/entries/205.asm
rename to data/pokedex/entries/forretress.asm
diff --git a/data/pokedex/entries/162.asm b/data/pokedex/entries/furret.asm
similarity index 100%
rename from data/pokedex/entries/162.asm
rename to data/pokedex/entries/furret.asm
diff --git a/data/pokedex/entries/092.asm b/data/pokedex/entries/gastly.asm
similarity index 100%
rename from data/pokedex/entries/092.asm
rename to data/pokedex/entries/gastly.asm
diff --git a/data/pokedex/entries/094.asm b/data/pokedex/entries/gengar.asm
similarity index 100%
rename from data/pokedex/entries/094.asm
rename to data/pokedex/entries/gengar.asm
diff --git a/data/pokedex/entries/074.asm b/data/pokedex/entries/geodude.asm
similarity index 100%
rename from data/pokedex/entries/074.asm
rename to data/pokedex/entries/geodude.asm
diff --git a/data/pokedex/entries/203.asm b/data/pokedex/entries/girafarig.asm
similarity index 100%
rename from data/pokedex/entries/203.asm
rename to data/pokedex/entries/girafarig.asm
diff --git a/data/pokedex/entries/207.asm b/data/pokedex/entries/gligar.asm
similarity index 100%
rename from data/pokedex/entries/207.asm
rename to data/pokedex/entries/gligar.asm
diff --git a/data/pokedex/entries/044.asm b/data/pokedex/entries/gloom.asm
similarity index 100%
rename from data/pokedex/entries/044.asm
rename to data/pokedex/entries/gloom.asm
diff --git a/data/pokedex/entries/042.asm b/data/pokedex/entries/golbat.asm
similarity index 100%
rename from data/pokedex/entries/042.asm
rename to data/pokedex/entries/golbat.asm
diff --git a/data/pokedex/entries/118.asm b/data/pokedex/entries/goldeen.asm
similarity index 100%
rename from data/pokedex/entries/118.asm
rename to data/pokedex/entries/goldeen.asm
diff --git a/data/pokedex/entries/055.asm b/data/pokedex/entries/golduck.asm
similarity index 100%
rename from data/pokedex/entries/055.asm
rename to data/pokedex/entries/golduck.asm
diff --git a/data/pokedex/entries/076.asm b/data/pokedex/entries/golem.asm
similarity index 100%
rename from data/pokedex/entries/076.asm
rename to data/pokedex/entries/golem.asm
diff --git a/data/pokedex/entries/210.asm b/data/pokedex/entries/granbull.asm
similarity index 100%
rename from data/pokedex/entries/210.asm
rename to data/pokedex/entries/granbull.asm
diff --git a/data/pokedex/entries/075.asm b/data/pokedex/entries/graveler.asm
similarity index 100%
rename from data/pokedex/entries/075.asm
rename to data/pokedex/entries/graveler.asm
diff --git a/data/pokedex/entries/088.asm b/data/pokedex/entries/grimer.asm
similarity index 100%
rename from data/pokedex/entries/088.asm
rename to data/pokedex/entries/grimer.asm
diff --git a/data/pokedex/entries/058.asm b/data/pokedex/entries/growlithe.asm
similarity index 100%
rename from data/pokedex/entries/058.asm
rename to data/pokedex/entries/growlithe.asm
diff --git a/data/pokedex/entries/130.asm b/data/pokedex/entries/gyarados.asm
similarity index 100%
rename from data/pokedex/entries/130.asm
rename to data/pokedex/entries/gyarados.asm
diff --git a/data/pokedex/entries/093.asm b/data/pokedex/entries/haunter.asm
similarity index 100%
rename from data/pokedex/entries/093.asm
rename to data/pokedex/entries/haunter.asm
diff --git a/data/pokedex/entries/214.asm b/data/pokedex/entries/heracross.asm
similarity index 100%
rename from data/pokedex/entries/214.asm
rename to data/pokedex/entries/heracross.asm
diff --git a/data/pokedex/entries/107.asm b/data/pokedex/entries/hitmonchan.asm
similarity index 100%
rename from data/pokedex/entries/107.asm
rename to data/pokedex/entries/hitmonchan.asm
diff --git a/data/pokedex/entries/106.asm b/data/pokedex/entries/hitmonlee.asm
similarity index 100%
rename from data/pokedex/entries/106.asm
rename to data/pokedex/entries/hitmonlee.asm
diff --git a/data/pokedex/entries/237.asm b/data/pokedex/entries/hitmontop.asm
similarity index 100%
rename from data/pokedex/entries/237.asm
rename to data/pokedex/entries/hitmontop.asm
diff --git a/data/pokedex/entries/250.asm b/data/pokedex/entries/ho_oh.asm
similarity index 100%
rename from data/pokedex/entries/250.asm
rename to data/pokedex/entries/ho_oh.asm
diff --git a/data/pokedex/entries/163.asm b/data/pokedex/entries/hoothoot.asm
similarity index 100%
rename from data/pokedex/entries/163.asm
rename to data/pokedex/entries/hoothoot.asm
diff --git a/data/pokedex/entries/187.asm b/data/pokedex/entries/hoppip.asm
similarity index 100%
rename from data/pokedex/entries/187.asm
rename to data/pokedex/entries/hoppip.asm
diff --git a/data/pokedex/entries/116.asm b/data/pokedex/entries/horsea.asm
similarity index 100%
rename from data/pokedex/entries/116.asm
rename to data/pokedex/entries/horsea.asm
diff --git a/data/pokedex/entries/229.asm b/data/pokedex/entries/houndoom.asm
similarity index 100%
rename from data/pokedex/entries/229.asm
rename to data/pokedex/entries/houndoom.asm
diff --git a/data/pokedex/entries/228.asm b/data/pokedex/entries/houndour.asm
similarity index 100%
rename from data/pokedex/entries/228.asm
rename to data/pokedex/entries/houndour.asm
diff --git a/data/pokedex/entries/097.asm b/data/pokedex/entries/hypno.asm
similarity index 100%
rename from data/pokedex/entries/097.asm
rename to data/pokedex/entries/hypno.asm
diff --git a/data/pokedex/entries/174.asm b/data/pokedex/entries/igglybuff.asm
similarity index 100%
rename from data/pokedex/entries/174.asm
rename to data/pokedex/entries/igglybuff.asm
diff --git a/data/pokedex/entries/002.asm b/data/pokedex/entries/ivysaur.asm
similarity index 100%
rename from data/pokedex/entries/002.asm
rename to data/pokedex/entries/ivysaur.asm
diff --git a/data/pokedex/entries/039.asm b/data/pokedex/entries/jigglypuff.asm
similarity index 100%
rename from data/pokedex/entries/039.asm
rename to data/pokedex/entries/jigglypuff.asm
diff --git a/data/pokedex/entries/135.asm b/data/pokedex/entries/jolteon.asm
similarity index 100%
rename from data/pokedex/entries/135.asm
rename to data/pokedex/entries/jolteon.asm
diff --git a/data/pokedex/entries/189.asm b/data/pokedex/entries/jumpluff.asm
similarity index 100%
rename from data/pokedex/entries/189.asm
rename to data/pokedex/entries/jumpluff.asm
diff --git a/data/pokedex/entries/124.asm b/data/pokedex/entries/jynx.asm
similarity index 100%
rename from data/pokedex/entries/124.asm
rename to data/pokedex/entries/jynx.asm
diff --git a/data/pokedex/entries/140.asm b/data/pokedex/entries/kabuto.asm
similarity index 100%
rename from data/pokedex/entries/140.asm
rename to data/pokedex/entries/kabuto.asm
diff --git a/data/pokedex/entries/141.asm b/data/pokedex/entries/kabutops.asm
similarity index 100%
rename from data/pokedex/entries/141.asm
rename to data/pokedex/entries/kabutops.asm
diff --git a/data/pokedex/entries/064.asm b/data/pokedex/entries/kadabra.asm
similarity index 100%
rename from data/pokedex/entries/064.asm
rename to data/pokedex/entries/kadabra.asm
diff --git a/data/pokedex/entries/014.asm b/data/pokedex/entries/kakuna.asm
similarity index 100%
rename from data/pokedex/entries/014.asm
rename to data/pokedex/entries/kakuna.asm
diff --git a/data/pokedex/entries/115.asm b/data/pokedex/entries/kangaskhan.asm
similarity index 100%
rename from data/pokedex/entries/115.asm
rename to data/pokedex/entries/kangaskhan.asm
diff --git a/data/pokedex/entries/230.asm b/data/pokedex/entries/kingdra.asm
similarity index 100%
rename from data/pokedex/entries/230.asm
rename to data/pokedex/entries/kingdra.asm
diff --git a/data/pokedex/entries/099.asm b/data/pokedex/entries/kingler.asm
similarity index 100%
rename from data/pokedex/entries/099.asm
rename to data/pokedex/entries/kingler.asm
diff --git a/data/pokedex/entries/109.asm b/data/pokedex/entries/koffing.asm
similarity index 100%
rename from data/pokedex/entries/109.asm
rename to data/pokedex/entries/koffing.asm
diff --git a/data/pokedex/entries/098.asm b/data/pokedex/entries/krabby.asm
similarity index 100%
rename from data/pokedex/entries/098.asm
rename to data/pokedex/entries/krabby.asm
diff --git a/data/pokedex/entries/171.asm b/data/pokedex/entries/lanturn.asm
similarity index 100%
rename from data/pokedex/entries/171.asm
rename to data/pokedex/entries/lanturn.asm
diff --git a/data/pokedex/entries/131.asm b/data/pokedex/entries/lapras.asm
similarity index 100%
rename from data/pokedex/entries/131.asm
rename to data/pokedex/entries/lapras.asm
diff --git a/data/pokedex/entries/246.asm b/data/pokedex/entries/larvitar.asm
similarity index 100%
rename from data/pokedex/entries/246.asm
rename to data/pokedex/entries/larvitar.asm
diff --git a/data/pokedex/entries/166.asm b/data/pokedex/entries/ledian.asm
similarity index 100%
rename from data/pokedex/entries/166.asm
rename to data/pokedex/entries/ledian.asm
diff --git a/data/pokedex/entries/165.asm b/data/pokedex/entries/ledyba.asm
similarity index 100%
rename from data/pokedex/entries/165.asm
rename to data/pokedex/entries/ledyba.asm
diff --git a/data/pokedex/entries/108.asm b/data/pokedex/entries/lickitung.asm
similarity index 100%
rename from data/pokedex/entries/108.asm
rename to data/pokedex/entries/lickitung.asm
diff --git a/data/pokedex/entries/249.asm b/data/pokedex/entries/lugia.asm
similarity index 100%
rename from data/pokedex/entries/249.asm
rename to data/pokedex/entries/lugia.asm
diff --git a/data/pokedex/entries/068.asm b/data/pokedex/entries/machamp.asm
similarity index 100%
rename from data/pokedex/entries/068.asm
rename to data/pokedex/entries/machamp.asm
diff --git a/data/pokedex/entries/067.asm b/data/pokedex/entries/machoke.asm
similarity index 100%
rename from data/pokedex/entries/067.asm
rename to data/pokedex/entries/machoke.asm
diff --git a/data/pokedex/entries/066.asm b/data/pokedex/entries/machop.asm
similarity index 100%
rename from data/pokedex/entries/066.asm
rename to data/pokedex/entries/machop.asm
diff --git a/data/pokedex/entries/240.asm b/data/pokedex/entries/magby.asm
similarity index 100%
rename from data/pokedex/entries/240.asm
rename to data/pokedex/entries/magby.asm
diff --git a/data/pokedex/entries/219.asm b/data/pokedex/entries/magcargo.asm
similarity index 100%
rename from data/pokedex/entries/219.asm
rename to data/pokedex/entries/magcargo.asm
diff --git a/data/pokedex/entries/129.asm b/data/pokedex/entries/magikarp.asm
similarity index 100%
rename from data/pokedex/entries/129.asm
rename to data/pokedex/entries/magikarp.asm
diff --git a/data/pokedex/entries/126.asm b/data/pokedex/entries/magmar.asm
similarity index 100%
rename from data/pokedex/entries/126.asm
rename to data/pokedex/entries/magmar.asm
diff --git a/data/pokedex/entries/081.asm b/data/pokedex/entries/magnemite.asm
similarity index 100%
rename from data/pokedex/entries/081.asm
rename to data/pokedex/entries/magnemite.asm
diff --git a/data/pokedex/entries/082.asm b/data/pokedex/entries/magneton.asm
similarity index 100%
rename from data/pokedex/entries/082.asm
rename to data/pokedex/entries/magneton.asm
diff --git a/data/pokedex/entries/056.asm b/data/pokedex/entries/mankey.asm
similarity index 100%
rename from data/pokedex/entries/056.asm
rename to data/pokedex/entries/mankey.asm
diff --git a/data/pokedex/entries/226.asm b/data/pokedex/entries/mantine.asm
similarity index 100%
rename from data/pokedex/entries/226.asm
rename to data/pokedex/entries/mantine.asm
diff --git a/data/pokedex/entries/179.asm b/data/pokedex/entries/mareep.asm
similarity index 100%
rename from data/pokedex/entries/179.asm
rename to data/pokedex/entries/mareep.asm
diff --git a/data/pokedex/entries/183.asm b/data/pokedex/entries/marill.asm
similarity index 100%
rename from data/pokedex/entries/183.asm
rename to data/pokedex/entries/marill.asm
diff --git a/data/pokedex/entries/105.asm b/data/pokedex/entries/marowak.asm
similarity index 100%
rename from data/pokedex/entries/105.asm
rename to data/pokedex/entries/marowak.asm
diff --git a/data/pokedex/entries/154.asm b/data/pokedex/entries/meganium.asm
similarity index 100%
rename from data/pokedex/entries/154.asm
rename to data/pokedex/entries/meganium.asm
diff --git a/data/pokedex/entries/052.asm b/data/pokedex/entries/meowth.asm
similarity index 100%
rename from data/pokedex/entries/052.asm
rename to data/pokedex/entries/meowth.asm
diff --git a/data/pokedex/entries/011.asm b/data/pokedex/entries/metapod.asm
similarity index 100%
rename from data/pokedex/entries/011.asm
rename to data/pokedex/entries/metapod.asm
diff --git a/data/pokedex/entries/151.asm b/data/pokedex/entries/mew.asm
similarity index 100%
rename from data/pokedex/entries/151.asm
rename to data/pokedex/entries/mew.asm
diff --git a/data/pokedex/entries/150.asm b/data/pokedex/entries/mewtwo.asm
similarity index 100%
rename from data/pokedex/entries/150.asm
rename to data/pokedex/entries/mewtwo.asm
diff --git a/data/pokedex/entries/241.asm b/data/pokedex/entries/miltank.asm
similarity index 100%
rename from data/pokedex/entries/241.asm
rename to data/pokedex/entries/miltank.asm
diff --git a/data/pokedex/entries/200.asm b/data/pokedex/entries/misdreavus.asm
similarity index 100%
rename from data/pokedex/entries/200.asm
rename to data/pokedex/entries/misdreavus.asm
diff --git a/data/pokedex/entries/146.asm b/data/pokedex/entries/moltres.asm
similarity index 100%
rename from data/pokedex/entries/146.asm
rename to data/pokedex/entries/moltres.asm
diff --git a/data/pokedex/entries/122.asm b/data/pokedex/entries/mr__mime.asm
similarity index 100%
rename from data/pokedex/entries/122.asm
rename to data/pokedex/entries/mr__mime.asm
diff --git a/data/pokedex/entries/089.asm b/data/pokedex/entries/muk.asm
similarity index 100%
rename from data/pokedex/entries/089.asm
rename to data/pokedex/entries/muk.asm
diff --git a/data/pokedex/entries/198.asm b/data/pokedex/entries/murkrow.asm
similarity index 100%
rename from data/pokedex/entries/198.asm
rename to data/pokedex/entries/murkrow.asm
diff --git a/data/pokedex/entries/177.asm b/data/pokedex/entries/natu.asm
similarity index 100%
rename from data/pokedex/entries/177.asm
rename to data/pokedex/entries/natu.asm
diff --git a/data/pokedex/entries/034.asm b/data/pokedex/entries/nidoking.asm
similarity index 100%
rename from data/pokedex/entries/034.asm
rename to data/pokedex/entries/nidoking.asm
diff --git a/data/pokedex/entries/031.asm b/data/pokedex/entries/nidoqueen.asm
similarity index 100%
rename from data/pokedex/entries/031.asm
rename to data/pokedex/entries/nidoqueen.asm
diff --git a/data/pokedex/entries/029.asm b/data/pokedex/entries/nidoran_f.asm
similarity index 100%
rename from data/pokedex/entries/029.asm
rename to data/pokedex/entries/nidoran_f.asm
diff --git a/data/pokedex/entries/032.asm b/data/pokedex/entries/nidoran_m.asm
similarity index 100%
rename from data/pokedex/entries/032.asm
rename to data/pokedex/entries/nidoran_m.asm
diff --git a/data/pokedex/entries/030.asm b/data/pokedex/entries/nidorina.asm
similarity index 100%
rename from data/pokedex/entries/030.asm
rename to data/pokedex/entries/nidorina.asm
diff --git a/data/pokedex/entries/033.asm b/data/pokedex/entries/nidorino.asm
similarity index 100%
rename from data/pokedex/entries/033.asm
rename to data/pokedex/entries/nidorino.asm
diff --git a/data/pokedex/entries/038.asm b/data/pokedex/entries/ninetales.asm
similarity index 100%
rename from data/pokedex/entries/038.asm
rename to data/pokedex/entries/ninetales.asm
diff --git a/data/pokedex/entries/164.asm b/data/pokedex/entries/noctowl.asm
similarity index 100%
rename from data/pokedex/entries/164.asm
rename to data/pokedex/entries/noctowl.asm
diff --git a/data/pokedex/entries/224.asm b/data/pokedex/entries/octillery.asm
similarity index 100%
rename from data/pokedex/entries/224.asm
rename to data/pokedex/entries/octillery.asm
diff --git a/data/pokedex/entries/043.asm b/data/pokedex/entries/oddish.asm
similarity index 100%
rename from data/pokedex/entries/043.asm
rename to data/pokedex/entries/oddish.asm
diff --git a/data/pokedex/entries/138.asm b/data/pokedex/entries/omanyte.asm
similarity index 100%
rename from data/pokedex/entries/138.asm
rename to data/pokedex/entries/omanyte.asm
diff --git a/data/pokedex/entries/139.asm b/data/pokedex/entries/omastar.asm
similarity index 100%
rename from data/pokedex/entries/139.asm
rename to data/pokedex/entries/omastar.asm
diff --git a/data/pokedex/entries/095.asm b/data/pokedex/entries/onix.asm
similarity index 100%
rename from data/pokedex/entries/095.asm
rename to data/pokedex/entries/onix.asm
diff --git a/data/pokedex/entries/046.asm b/data/pokedex/entries/paras.asm
similarity index 100%
rename from data/pokedex/entries/046.asm
rename to data/pokedex/entries/paras.asm
diff --git a/data/pokedex/entries/047.asm b/data/pokedex/entries/parasect.asm
similarity index 100%
rename from data/pokedex/entries/047.asm
rename to data/pokedex/entries/parasect.asm
diff --git a/data/pokedex/entries/053.asm b/data/pokedex/entries/persian.asm
similarity index 100%
rename from data/pokedex/entries/053.asm
rename to data/pokedex/entries/persian.asm
diff --git a/data/pokedex/entries/231.asm b/data/pokedex/entries/phanpy.asm
similarity index 100%
rename from data/pokedex/entries/231.asm
rename to data/pokedex/entries/phanpy.asm
diff --git a/data/pokedex/entries/172.asm b/data/pokedex/entries/pichu.asm
similarity index 100%
rename from data/pokedex/entries/172.asm
rename to data/pokedex/entries/pichu.asm
diff --git a/data/pokedex/entries/018.asm b/data/pokedex/entries/pidgeot.asm
similarity index 100%
rename from data/pokedex/entries/018.asm
rename to data/pokedex/entries/pidgeot.asm
diff --git a/data/pokedex/entries/017.asm b/data/pokedex/entries/pidgeotto.asm
similarity index 100%
rename from data/pokedex/entries/017.asm
rename to data/pokedex/entries/pidgeotto.asm
diff --git a/data/pokedex/entries/016.asm b/data/pokedex/entries/pidgey.asm
similarity index 100%
rename from data/pokedex/entries/016.asm
rename to data/pokedex/entries/pidgey.asm
diff --git a/data/pokedex/entries/025.asm b/data/pokedex/entries/pikachu.asm
similarity index 100%
rename from data/pokedex/entries/025.asm
rename to data/pokedex/entries/pikachu.asm
diff --git a/data/pokedex/entries/221.asm b/data/pokedex/entries/piloswine.asm
similarity index 100%
rename from data/pokedex/entries/221.asm
rename to data/pokedex/entries/piloswine.asm
diff --git a/data/pokedex/entries/204.asm b/data/pokedex/entries/pineco.asm
similarity index 100%
rename from data/pokedex/entries/204.asm
rename to data/pokedex/entries/pineco.asm
diff --git a/data/pokedex/entries/127.asm b/data/pokedex/entries/pinsir.asm
similarity index 100%
rename from data/pokedex/entries/127.asm
rename to data/pokedex/entries/pinsir.asm
diff --git a/data/pokedex/entries/186.asm b/data/pokedex/entries/politoed.asm
similarity index 100%
rename from data/pokedex/entries/186.asm
rename to data/pokedex/entries/politoed.asm
diff --git a/data/pokedex/entries/060.asm b/data/pokedex/entries/poliwag.asm
similarity index 100%
rename from data/pokedex/entries/060.asm
rename to data/pokedex/entries/poliwag.asm
diff --git a/data/pokedex/entries/061.asm b/data/pokedex/entries/poliwhirl.asm
similarity index 100%
rename from data/pokedex/entries/061.asm
rename to data/pokedex/entries/poliwhirl.asm
diff --git a/data/pokedex/entries/062.asm b/data/pokedex/entries/poliwrath.asm
similarity index 100%
rename from data/pokedex/entries/062.asm
rename to data/pokedex/entries/poliwrath.asm
diff --git a/data/pokedex/entries/077.asm b/data/pokedex/entries/ponyta.asm
similarity index 100%
rename from data/pokedex/entries/077.asm
rename to data/pokedex/entries/ponyta.asm
diff --git a/data/pokedex/entries/137.asm b/data/pokedex/entries/porygon.asm
similarity index 100%
rename from data/pokedex/entries/137.asm
rename to data/pokedex/entries/porygon.asm
diff --git a/data/pokedex/entries/233.asm b/data/pokedex/entries/porygon2.asm
similarity index 100%
rename from data/pokedex/entries/233.asm
rename to data/pokedex/entries/porygon2.asm
diff --git a/data/pokedex/entries/057.asm b/data/pokedex/entries/primeape.asm
similarity index 100%
rename from data/pokedex/entries/057.asm
rename to data/pokedex/entries/primeape.asm
diff --git a/data/pokedex/entries/054.asm b/data/pokedex/entries/psyduck.asm
similarity index 100%
rename from data/pokedex/entries/054.asm
rename to data/pokedex/entries/psyduck.asm
diff --git a/data/pokedex/entries/247.asm b/data/pokedex/entries/pupitar.asm
similarity index 100%
rename from data/pokedex/entries/247.asm
rename to data/pokedex/entries/pupitar.asm
diff --git a/data/pokedex/entries/195.asm b/data/pokedex/entries/quagsire.asm
similarity index 100%
rename from data/pokedex/entries/195.asm
rename to data/pokedex/entries/quagsire.asm
diff --git a/data/pokedex/entries/156.asm b/data/pokedex/entries/quilava.asm
similarity index 100%
rename from data/pokedex/entries/156.asm
rename to data/pokedex/entries/quilava.asm
diff --git a/data/pokedex/entries/211.asm b/data/pokedex/entries/qwilfish.asm
similarity index 100%
rename from data/pokedex/entries/211.asm
rename to data/pokedex/entries/qwilfish.asm
diff --git a/data/pokedex/entries/026.asm b/data/pokedex/entries/raichu.asm
similarity index 100%
rename from data/pokedex/entries/026.asm
rename to data/pokedex/entries/raichu.asm
diff --git a/data/pokedex/entries/243.asm b/data/pokedex/entries/raikou.asm
similarity index 100%
rename from data/pokedex/entries/243.asm
rename to data/pokedex/entries/raikou.asm
diff --git a/data/pokedex/entries/078.asm b/data/pokedex/entries/rapidash.asm
similarity index 100%
rename from data/pokedex/entries/078.asm
rename to data/pokedex/entries/rapidash.asm
diff --git a/data/pokedex/entries/020.asm b/data/pokedex/entries/raticate.asm
similarity index 100%
rename from data/pokedex/entries/020.asm
rename to data/pokedex/entries/raticate.asm
diff --git a/data/pokedex/entries/019.asm b/data/pokedex/entries/rattata.asm
similarity index 100%
rename from data/pokedex/entries/019.asm
rename to data/pokedex/entries/rattata.asm
diff --git a/data/pokedex/entries/223.asm b/data/pokedex/entries/remoraid.asm
similarity index 100%
rename from data/pokedex/entries/223.asm
rename to data/pokedex/entries/remoraid.asm
diff --git a/data/pokedex/entries/112.asm b/data/pokedex/entries/rhydon.asm
similarity index 100%
rename from data/pokedex/entries/112.asm
rename to data/pokedex/entries/rhydon.asm
diff --git a/data/pokedex/entries/111.asm b/data/pokedex/entries/rhyhorn.asm
similarity index 100%
rename from data/pokedex/entries/111.asm
rename to data/pokedex/entries/rhyhorn.asm
diff --git a/data/pokedex/entries/027.asm b/data/pokedex/entries/sandshrew.asm
similarity index 100%
rename from data/pokedex/entries/027.asm
rename to data/pokedex/entries/sandshrew.asm
diff --git a/data/pokedex/entries/028.asm b/data/pokedex/entries/sandslash.asm
similarity index 100%
rename from data/pokedex/entries/028.asm
rename to data/pokedex/entries/sandslash.asm
diff --git a/data/pokedex/entries/212.asm b/data/pokedex/entries/scizor.asm
similarity index 100%
rename from data/pokedex/entries/212.asm
rename to data/pokedex/entries/scizor.asm
diff --git a/data/pokedex/entries/123.asm b/data/pokedex/entries/scyther.asm
similarity index 100%
rename from data/pokedex/entries/123.asm
rename to data/pokedex/entries/scyther.asm
diff --git a/data/pokedex/entries/117.asm b/data/pokedex/entries/seadra.asm
similarity index 100%
rename from data/pokedex/entries/117.asm
rename to data/pokedex/entries/seadra.asm
diff --git a/data/pokedex/entries/119.asm b/data/pokedex/entries/seaking.asm
similarity index 100%
rename from data/pokedex/entries/119.asm
rename to data/pokedex/entries/seaking.asm
diff --git a/data/pokedex/entries/086.asm b/data/pokedex/entries/seel.asm
similarity index 100%
rename from data/pokedex/entries/086.asm
rename to data/pokedex/entries/seel.asm
diff --git a/data/pokedex/entries/161.asm b/data/pokedex/entries/sentret.asm
similarity index 100%
rename from data/pokedex/entries/161.asm
rename to data/pokedex/entries/sentret.asm
diff --git a/data/pokedex/entries/090.asm b/data/pokedex/entries/shellder.asm
similarity index 100%
rename from data/pokedex/entries/090.asm
rename to data/pokedex/entries/shellder.asm
diff --git a/data/pokedex/entries/213.asm b/data/pokedex/entries/shuckle.asm
similarity index 100%
rename from data/pokedex/entries/213.asm
rename to data/pokedex/entries/shuckle.asm
diff --git a/data/pokedex/entries/227.asm b/data/pokedex/entries/skarmory.asm
similarity index 100%
rename from data/pokedex/entries/227.asm
rename to data/pokedex/entries/skarmory.asm
diff --git a/data/pokedex/entries/188.asm b/data/pokedex/entries/skiploom.asm
similarity index 100%
rename from data/pokedex/entries/188.asm
rename to data/pokedex/entries/skiploom.asm
diff --git a/data/pokedex/entries/080.asm b/data/pokedex/entries/slowbro.asm
similarity index 100%
rename from data/pokedex/entries/080.asm
rename to data/pokedex/entries/slowbro.asm
diff --git a/data/pokedex/entries/199.asm b/data/pokedex/entries/slowking.asm
similarity index 100%
rename from data/pokedex/entries/199.asm
rename to data/pokedex/entries/slowking.asm
diff --git a/data/pokedex/entries/079.asm b/data/pokedex/entries/slowpoke.asm
similarity index 100%
rename from data/pokedex/entries/079.asm
rename to data/pokedex/entries/slowpoke.asm
diff --git a/data/pokedex/entries/218.asm b/data/pokedex/entries/slugma.asm
similarity index 100%
rename from data/pokedex/entries/218.asm
rename to data/pokedex/entries/slugma.asm
diff --git a/data/pokedex/entries/235.asm b/data/pokedex/entries/smeargle.asm
similarity index 100%
rename from data/pokedex/entries/235.asm
rename to data/pokedex/entries/smeargle.asm
diff --git a/data/pokedex/entries/238.asm b/data/pokedex/entries/smoochum.asm
similarity index 100%
rename from data/pokedex/entries/238.asm
rename to data/pokedex/entries/smoochum.asm
diff --git a/data/pokedex/entries/215.asm b/data/pokedex/entries/sneasel.asm
similarity index 100%
rename from data/pokedex/entries/215.asm
rename to data/pokedex/entries/sneasel.asm
diff --git a/data/pokedex/entries/143.asm b/data/pokedex/entries/snorlax.asm
similarity index 100%
rename from data/pokedex/entries/143.asm
rename to data/pokedex/entries/snorlax.asm
diff --git a/data/pokedex/entries/209.asm b/data/pokedex/entries/snubbull.asm
similarity index 100%
rename from data/pokedex/entries/209.asm
rename to data/pokedex/entries/snubbull.asm
diff --git a/data/pokedex/entries/021.asm b/data/pokedex/entries/spearow.asm
similarity index 100%
rename from data/pokedex/entries/021.asm
rename to data/pokedex/entries/spearow.asm
diff --git a/data/pokedex/entries/167.asm b/data/pokedex/entries/spinarak.asm
similarity index 100%
rename from data/pokedex/entries/167.asm
rename to data/pokedex/entries/spinarak.asm
diff --git a/data/pokedex/entries/007.asm b/data/pokedex/entries/squirtle.asm
similarity index 100%
rename from data/pokedex/entries/007.asm
rename to data/pokedex/entries/squirtle.asm
diff --git a/data/pokedex/entries/234.asm b/data/pokedex/entries/stantler.asm
similarity index 100%
rename from data/pokedex/entries/234.asm
rename to data/pokedex/entries/stantler.asm
diff --git a/data/pokedex/entries/121.asm b/data/pokedex/entries/starmie.asm
similarity index 100%
rename from data/pokedex/entries/121.asm
rename to data/pokedex/entries/starmie.asm
diff --git a/data/pokedex/entries/120.asm b/data/pokedex/entries/staryu.asm
similarity index 100%
rename from data/pokedex/entries/120.asm
rename to data/pokedex/entries/staryu.asm
diff --git a/data/pokedex/entries/208.asm b/data/pokedex/entries/steelix.asm
similarity index 100%
rename from data/pokedex/entries/208.asm
rename to data/pokedex/entries/steelix.asm
diff --git a/data/pokedex/entries/185.asm b/data/pokedex/entries/sudowoodo.asm
similarity index 100%
rename from data/pokedex/entries/185.asm
rename to data/pokedex/entries/sudowoodo.asm
diff --git a/data/pokedex/entries/245.asm b/data/pokedex/entries/suicune.asm
similarity index 100%
rename from data/pokedex/entries/245.asm
rename to data/pokedex/entries/suicune.asm
diff --git a/data/pokedex/entries/192.asm b/data/pokedex/entries/sunflora.asm
similarity index 100%
rename from data/pokedex/entries/192.asm
rename to data/pokedex/entries/sunflora.asm
diff --git a/data/pokedex/entries/191.asm b/data/pokedex/entries/sunkern.asm
similarity index 100%
rename from data/pokedex/entries/191.asm
rename to data/pokedex/entries/sunkern.asm
diff --git a/data/pokedex/entries/220.asm b/data/pokedex/entries/swinub.asm
similarity index 100%
rename from data/pokedex/entries/220.asm
rename to data/pokedex/entries/swinub.asm
diff --git a/data/pokedex/entries/114.asm b/data/pokedex/entries/tangela.asm
similarity index 100%
rename from data/pokedex/entries/114.asm
rename to data/pokedex/entries/tangela.asm
diff --git a/data/pokedex/entries/128.asm b/data/pokedex/entries/tauros.asm
similarity index 100%
rename from data/pokedex/entries/128.asm
rename to data/pokedex/entries/tauros.asm
diff --git a/data/pokedex/entries/216.asm b/data/pokedex/entries/teddiursa.asm
similarity index 100%
rename from data/pokedex/entries/216.asm
rename to data/pokedex/entries/teddiursa.asm
diff --git a/data/pokedex/entries/072.asm b/data/pokedex/entries/tentacool.asm
similarity index 100%
rename from data/pokedex/entries/072.asm
rename to data/pokedex/entries/tentacool.asm
diff --git a/data/pokedex/entries/073.asm b/data/pokedex/entries/tentacruel.asm
similarity index 100%
rename from data/pokedex/entries/073.asm
rename to data/pokedex/entries/tentacruel.asm
diff --git a/data/pokedex/entries/175.asm b/data/pokedex/entries/togepi.asm
similarity index 100%
rename from data/pokedex/entries/175.asm
rename to data/pokedex/entries/togepi.asm
diff --git a/data/pokedex/entries/176.asm b/data/pokedex/entries/togetic.asm
similarity index 100%
rename from data/pokedex/entries/176.asm
rename to data/pokedex/entries/togetic.asm
diff --git a/data/pokedex/entries/158.asm b/data/pokedex/entries/totodile.asm
similarity index 100%
rename from data/pokedex/entries/158.asm
rename to data/pokedex/entries/totodile.asm
diff --git a/data/pokedex/entries/157.asm b/data/pokedex/entries/typhlosion.asm
similarity index 100%
rename from data/pokedex/entries/157.asm
rename to data/pokedex/entries/typhlosion.asm
diff --git a/data/pokedex/entries/248.asm b/data/pokedex/entries/tyranitar.asm
similarity index 100%
rename from data/pokedex/entries/248.asm
rename to data/pokedex/entries/tyranitar.asm
diff --git a/data/pokedex/entries/236.asm b/data/pokedex/entries/tyrogue.asm
similarity index 100%
rename from data/pokedex/entries/236.asm
rename to data/pokedex/entries/tyrogue.asm
diff --git a/data/pokedex/entries/197.asm b/data/pokedex/entries/umbreon.asm
similarity index 100%
rename from data/pokedex/entries/197.asm
rename to data/pokedex/entries/umbreon.asm
diff --git a/data/pokedex/entries/201.asm b/data/pokedex/entries/unown.asm
similarity index 100%
rename from data/pokedex/entries/201.asm
rename to data/pokedex/entries/unown.asm
diff --git a/data/pokedex/entries/217.asm b/data/pokedex/entries/ursaring.asm
similarity index 100%
rename from data/pokedex/entries/217.asm
rename to data/pokedex/entries/ursaring.asm
diff --git a/data/pokedex/entries/134.asm b/data/pokedex/entries/vaporeon.asm
similarity index 100%
rename from data/pokedex/entries/134.asm
rename to data/pokedex/entries/vaporeon.asm
diff --git a/data/pokedex/entries/049.asm b/data/pokedex/entries/venomoth.asm
similarity index 100%
rename from data/pokedex/entries/049.asm
rename to data/pokedex/entries/venomoth.asm
diff --git a/data/pokedex/entries/048.asm b/data/pokedex/entries/venonat.asm
similarity index 100%
rename from data/pokedex/entries/048.asm
rename to data/pokedex/entries/venonat.asm
diff --git a/data/pokedex/entries/003.asm b/data/pokedex/entries/venusaur.asm
similarity index 100%
rename from data/pokedex/entries/003.asm
rename to data/pokedex/entries/venusaur.asm
diff --git a/data/pokedex/entries/071.asm b/data/pokedex/entries/victreebel.asm
similarity index 100%
rename from data/pokedex/entries/071.asm
rename to data/pokedex/entries/victreebel.asm
diff --git a/data/pokedex/entries/045.asm b/data/pokedex/entries/vileplume.asm
similarity index 100%
rename from data/pokedex/entries/045.asm
rename to data/pokedex/entries/vileplume.asm
diff --git a/data/pokedex/entries/100.asm b/data/pokedex/entries/voltorb.asm
similarity index 100%
rename from data/pokedex/entries/100.asm
rename to data/pokedex/entries/voltorb.asm
diff --git a/data/pokedex/entries/037.asm b/data/pokedex/entries/vulpix.asm
similarity index 100%
rename from data/pokedex/entries/037.asm
rename to data/pokedex/entries/vulpix.asm
diff --git a/data/pokedex/entries/008.asm b/data/pokedex/entries/wartortle.asm
similarity index 100%
rename from data/pokedex/entries/008.asm
rename to data/pokedex/entries/wartortle.asm
diff --git a/data/pokedex/entries/013.asm b/data/pokedex/entries/weedle.asm
similarity index 100%
rename from data/pokedex/entries/013.asm
rename to data/pokedex/entries/weedle.asm
diff --git a/data/pokedex/entries/070.asm b/data/pokedex/entries/weepinbell.asm
similarity index 100%
rename from data/pokedex/entries/070.asm
rename to data/pokedex/entries/weepinbell.asm
diff --git a/data/pokedex/entries/110.asm b/data/pokedex/entries/weezing.asm
similarity index 100%
rename from data/pokedex/entries/110.asm
rename to data/pokedex/entries/weezing.asm
diff --git a/data/pokedex/entries/040.asm b/data/pokedex/entries/wigglytuff.asm
similarity index 100%
rename from data/pokedex/entries/040.asm
rename to data/pokedex/entries/wigglytuff.asm
diff --git a/data/pokedex/entries/202.asm b/data/pokedex/entries/wobbuffet.asm
similarity index 100%
rename from data/pokedex/entries/202.asm
rename to data/pokedex/entries/wobbuffet.asm
diff --git a/data/pokedex/entries/194.asm b/data/pokedex/entries/wooper.asm
similarity index 100%
rename from data/pokedex/entries/194.asm
rename to data/pokedex/entries/wooper.asm
diff --git a/data/pokedex/entries/178.asm b/data/pokedex/entries/xatu.asm
similarity index 100%
rename from data/pokedex/entries/178.asm
rename to data/pokedex/entries/xatu.asm
diff --git a/data/pokedex/entries/193.asm b/data/pokedex/entries/yanma.asm
similarity index 100%
rename from data/pokedex/entries/193.asm
rename to data/pokedex/entries/yanma.asm
diff --git a/data/pokedex/entries/145.asm b/data/pokedex/entries/zapdos.asm
similarity index 100%
rename from data/pokedex/entries/145.asm
rename to data/pokedex/entries/zapdos.asm
diff --git a/data/pokedex/entries/041.asm b/data/pokedex/entries/zubat.asm
similarity index 100%
rename from data/pokedex/entries/041.asm
rename to data/pokedex/entries/zubat.asm
diff --git a/data/pokedex/entries_1.asm b/data/pokedex/entries_1.asm
index f45bba49f..7f3c04cd6 100644
--- a/data/pokedex/entries_1.asm
+++ b/data/pokedex/entries_1.asm
@@ -1,64 +1,64 @@
-BulbasaurPokedexEntry::  INCLUDE "data/pokedex/entries/001.asm"
-IvysaurPokedexEntry::    INCLUDE "data/pokedex/entries/002.asm"
-VenusaurPokedexEntry::   INCLUDE "data/pokedex/entries/003.asm"
-CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/004.asm"
-CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/005.asm"
-CharizardPokedexEntry::  INCLUDE "data/pokedex/entries/006.asm"
-SquirtlePokedexEntry::   INCLUDE "data/pokedex/entries/007.asm"
-WartortlePokedexEntry::  INCLUDE "data/pokedex/entries/008.asm"
-BlastoisePokedexEntry::  INCLUDE "data/pokedex/entries/009.asm"
-CaterpiePokedexEntry::   INCLUDE "data/pokedex/entries/010.asm"
-MetapodPokedexEntry::    INCLUDE "data/pokedex/entries/011.asm"
-ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/012.asm"
-WeedlePokedexEntry::     INCLUDE "data/pokedex/entries/013.asm"
-KakunaPokedexEntry::     INCLUDE "data/pokedex/entries/014.asm"
-BeedrillPokedexEntry::   INCLUDE "data/pokedex/entries/015.asm"
-PidgeyPokedexEntry::     INCLUDE "data/pokedex/entries/016.asm"
-PidgeottoPokedexEntry::  INCLUDE "data/pokedex/entries/017.asm"
-PidgeotPokedexEntry::    INCLUDE "data/pokedex/entries/018.asm"
-RattataPokedexEntry::    INCLUDE "data/pokedex/entries/019.asm"
-RaticatePokedexEntry::   INCLUDE "data/pokedex/entries/020.asm"
-SpearowPokedexEntry::    INCLUDE "data/pokedex/entries/021.asm"
-FearowPokedexEntry::     INCLUDE "data/pokedex/entries/022.asm"
-EkansPokedexEntry::      INCLUDE "data/pokedex/entries/023.asm"
-ArbokPokedexEntry::      INCLUDE "data/pokedex/entries/024.asm"
-PikachuPokedexEntry::    INCLUDE "data/pokedex/entries/025.asm"
-RaichuPokedexEntry::     INCLUDE "data/pokedex/entries/026.asm"
-SandshrewPokedexEntry::  INCLUDE "data/pokedex/entries/027.asm"
-SandslashPokedexEntry::  INCLUDE "data/pokedex/entries/028.asm"
-NidoranFPokedexEntry::   INCLUDE "data/pokedex/entries/029.asm"
-NidorinaPokedexEntry::   INCLUDE "data/pokedex/entries/030.asm"
-NidoqueenPokedexEntry::  INCLUDE "data/pokedex/entries/031.asm"
-NidoranMPokedexEntry::   INCLUDE "data/pokedex/entries/032.asm"
-NidorinoPokedexEntry::   INCLUDE "data/pokedex/entries/033.asm"
-NidokingPokedexEntry::   INCLUDE "data/pokedex/entries/034.asm"
-ClefairyPokedexEntry::   INCLUDE "data/pokedex/entries/035.asm"
-ClefablePokedexEntry::   INCLUDE "data/pokedex/entries/036.asm"
-VulpixPokedexEntry::     INCLUDE "data/pokedex/entries/037.asm"
-NinetalesPokedexEntry::  INCLUDE "data/pokedex/entries/038.asm"
-JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/039.asm"
-WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/040.asm"
-ZubatPokedexEntry::      INCLUDE "data/pokedex/entries/041.asm"
-GolbatPokedexEntry::     INCLUDE "data/pokedex/entries/042.asm"
-OddishPokedexEntry::     INCLUDE "data/pokedex/entries/043.asm"
-GloomPokedexEntry::      INCLUDE "data/pokedex/entries/044.asm"
-VileplumePokedexEntry::  INCLUDE "data/pokedex/entries/045.asm"
-ParasPokedexEntry::      INCLUDE "data/pokedex/entries/046.asm"
-ParasectPokedexEntry::   INCLUDE "data/pokedex/entries/047.asm"
-VenonatPokedexEntry::    INCLUDE "data/pokedex/entries/048.asm"
-VenomothPokedexEntry::   INCLUDE "data/pokedex/entries/049.asm"
-DiglettPokedexEntry::    INCLUDE "data/pokedex/entries/050.asm"
-DugtrioPokedexEntry::    INCLUDE "data/pokedex/entries/051.asm"
-MeowthPokedexEntry::     INCLUDE "data/pokedex/entries/052.asm"
-PersianPokedexEntry::    INCLUDE "data/pokedex/entries/053.asm"
-PsyduckPokedexEntry::    INCLUDE "data/pokedex/entries/054.asm"
-GolduckPokedexEntry::    INCLUDE "data/pokedex/entries/055.asm"
-MankeyPokedexEntry::     INCLUDE "data/pokedex/entries/056.asm"
-PrimeapePokedexEntry::   INCLUDE "data/pokedex/entries/057.asm"
-GrowlithePokedexEntry::  INCLUDE "data/pokedex/entries/058.asm"
-ArcaninePokedexEntry::   INCLUDE "data/pokedex/entries/059.asm"
-PoliwagPokedexEntry::    INCLUDE "data/pokedex/entries/060.asm"
-PoliwhirlPokedexEntry::  INCLUDE "data/pokedex/entries/061.asm"
-PoliwrathPokedexEntry::  INCLUDE "data/pokedex/entries/062.asm"
-AbraPokedexEntry::       INCLUDE "data/pokedex/entries/063.asm"
-KadabraPokedexEntry::    INCLUDE "data/pokedex/entries/064.asm"
+BulbasaurPokedexEntry::  INCLUDE "data/pokedex/entries/bulbasaur.asm"
+IvysaurPokedexEntry::    INCLUDE "data/pokedex/entries/ivysaur.asm"
+VenusaurPokedexEntry::   INCLUDE "data/pokedex/entries/venusaur.asm"
+CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/charmander.asm"
+CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/charmeleon.asm"
+CharizardPokedexEntry::  INCLUDE "data/pokedex/entries/charizard.asm"
+SquirtlePokedexEntry::   INCLUDE "data/pokedex/entries/squirtle.asm"
+WartortlePokedexEntry::  INCLUDE "data/pokedex/entries/wartortle.asm"
+BlastoisePokedexEntry::  INCLUDE "data/pokedex/entries/blastoise.asm"
+CaterpiePokedexEntry::   INCLUDE "data/pokedex/entries/caterpie.asm"
+MetapodPokedexEntry::    INCLUDE "data/pokedex/entries/metapod.asm"
+ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/butterfree.asm"
+WeedlePokedexEntry::     INCLUDE "data/pokedex/entries/weedle.asm"
+KakunaPokedexEntry::     INCLUDE "data/pokedex/entries/kakuna.asm"
+BeedrillPokedexEntry::   INCLUDE "data/pokedex/entries/beedrill.asm"
+PidgeyPokedexEntry::     INCLUDE "data/pokedex/entries/pidgey.asm"
+PidgeottoPokedexEntry::  INCLUDE "data/pokedex/entries/pidgeotto.asm"
+PidgeotPokedexEntry::    INCLUDE "data/pokedex/entries/pidgeot.asm"
+RattataPokedexEntry::    INCLUDE "data/pokedex/entries/rattata.asm"
+RaticatePokedexEntry::   INCLUDE "data/pokedex/entries/raticate.asm"
+SpearowPokedexEntry::    INCLUDE "data/pokedex/entries/spearow.asm"
+FearowPokedexEntry::     INCLUDE "data/pokedex/entries/fearow.asm"
+EkansPokedexEntry::      INCLUDE "data/pokedex/entries/ekans.asm"
+ArbokPokedexEntry::      INCLUDE "data/pokedex/entries/arbok.asm"
+PikachuPokedexEntry::    INCLUDE "data/pokedex/entries/pikachu.asm"
+RaichuPokedexEntry::     INCLUDE "data/pokedex/entries/raichu.asm"
+SandshrewPokedexEntry::  INCLUDE "data/pokedex/entries/sandshrew.asm"
+SandslashPokedexEntry::  INCLUDE "data/pokedex/entries/sandslash.asm"
+NidoranFPokedexEntry::   INCLUDE "data/pokedex/entries/nidoran_f.asm"
+NidorinaPokedexEntry::   INCLUDE "data/pokedex/entries/nidorina.asm"
+NidoqueenPokedexEntry::  INCLUDE "data/pokedex/entries/nidoqueen.asm"
+NidoranMPokedexEntry::   INCLUDE "data/pokedex/entries/nidoran_m.asm"
+NidorinoPokedexEntry::   INCLUDE "data/pokedex/entries/nidorino.asm"
+NidokingPokedexEntry::   INCLUDE "data/pokedex/entries/nidoking.asm"
+ClefairyPokedexEntry::   INCLUDE "data/pokedex/entries/clefairy.asm"
+ClefablePokedexEntry::   INCLUDE "data/pokedex/entries/clefable.asm"
+VulpixPokedexEntry::     INCLUDE "data/pokedex/entries/vulpix.asm"
+NinetalesPokedexEntry::  INCLUDE "data/pokedex/entries/ninetales.asm"
+JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/jigglypuff.asm"
+WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/wigglytuff.asm"
+ZubatPokedexEntry::      INCLUDE "data/pokedex/entries/zubat.asm"
+GolbatPokedexEntry::     INCLUDE "data/pokedex/entries/golbat.asm"
+OddishPokedexEntry::     INCLUDE "data/pokedex/entries/oddish.asm"
+GloomPokedexEntry::      INCLUDE "data/pokedex/entries/gloom.asm"
+VileplumePokedexEntry::  INCLUDE "data/pokedex/entries/vileplume.asm"
+ParasPokedexEntry::      INCLUDE "data/pokedex/entries/paras.asm"
+ParasectPokedexEntry::   INCLUDE "data/pokedex/entries/parasect.asm"
+VenonatPokedexEntry::    INCLUDE "data/pokedex/entries/venonat.asm"
+VenomothPokedexEntry::   INCLUDE "data/pokedex/entries/venomoth.asm"
+DiglettPokedexEntry::    INCLUDE "data/pokedex/entries/diglett.asm"
+DugtrioPokedexEntry::    INCLUDE "data/pokedex/entries/dugtrio.asm"
+MeowthPokedexEntry::     INCLUDE "data/pokedex/entries/meowth.asm"
+PersianPokedexEntry::    INCLUDE "data/pokedex/entries/persian.asm"
+PsyduckPokedexEntry::    INCLUDE "data/pokedex/entries/psyduck.asm"
+GolduckPokedexEntry::    INCLUDE "data/pokedex/entries/golduck.asm"
+MankeyPokedexEntry::     INCLUDE "data/pokedex/entries/mankey.asm"
+PrimeapePokedexEntry::   INCLUDE "data/pokedex/entries/primeape.asm"
+GrowlithePokedexEntry::  INCLUDE "data/pokedex/entries/growlithe.asm"
+ArcaninePokedexEntry::   INCLUDE "data/pokedex/entries/arcanine.asm"
+PoliwagPokedexEntry::    INCLUDE "data/pokedex/entries/poliwag.asm"
+PoliwhirlPokedexEntry::  INCLUDE "data/pokedex/entries/poliwhirl.asm"
+PoliwrathPokedexEntry::  INCLUDE "data/pokedex/entries/poliwrath.asm"
+AbraPokedexEntry::       INCLUDE "data/pokedex/entries/abra.asm"
+KadabraPokedexEntry::    INCLUDE "data/pokedex/entries/kadabra.asm"
diff --git a/data/pokedex/entries_2.asm b/data/pokedex/entries_2.asm
index 2561d6c3e..881986d92 100644
--- a/data/pokedex/entries_2.asm
+++ b/data/pokedex/entries_2.asm
@@ -1,64 +1,64 @@
-AlakazamPokedexEntry::   INCLUDE "data/pokedex/entries/065.asm"
-MachopPokedexEntry::     INCLUDE "data/pokedex/entries/066.asm"
-MachokePokedexEntry::    INCLUDE "data/pokedex/entries/067.asm"
-MachampPokedexEntry::    INCLUDE "data/pokedex/entries/068.asm"
-BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/069.asm"
-WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/070.asm"
-VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/071.asm"
-TentacoolPokedexEntry::  INCLUDE "data/pokedex/entries/072.asm"
-TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/073.asm"
-GeodudePokedexEntry::    INCLUDE "data/pokedex/entries/074.asm"
-GravelerPokedexEntry::   INCLUDE "data/pokedex/entries/075.asm"
-GolemPokedexEntry::      INCLUDE "data/pokedex/entries/076.asm"
-PonytaPokedexEntry::     INCLUDE "data/pokedex/entries/077.asm"
-RapidashPokedexEntry::   INCLUDE "data/pokedex/entries/078.asm"
-SlowpokePokedexEntry::   INCLUDE "data/pokedex/entries/079.asm"
-SlowbroPokedexEntry::    INCLUDE "data/pokedex/entries/080.asm"
-MagnemitePokedexEntry::  INCLUDE "data/pokedex/entries/081.asm"
-MagnetonPokedexEntry::   INCLUDE "data/pokedex/entries/082.asm"
-FarfetchDPokedexEntry::  INCLUDE "data/pokedex/entries/083.asm"
-DoduoPokedexEntry::      INCLUDE "data/pokedex/entries/084.asm"
-DodrioPokedexEntry::     INCLUDE "data/pokedex/entries/085.asm"
-SeelPokedexEntry::       INCLUDE "data/pokedex/entries/086.asm"
-DewgongPokedexEntry::    INCLUDE "data/pokedex/entries/087.asm"
-GrimerPokedexEntry::     INCLUDE "data/pokedex/entries/088.asm"
-MukPokedexEntry::        INCLUDE "data/pokedex/entries/089.asm"
-ShellderPokedexEntry::   INCLUDE "data/pokedex/entries/090.asm"
-CloysterPokedexEntry::   INCLUDE "data/pokedex/entries/091.asm"
-GastlyPokedexEntry::     INCLUDE "data/pokedex/entries/092.asm"
-HaunterPokedexEntry::    INCLUDE "data/pokedex/entries/093.asm"
-GengarPokedexEntry::     INCLUDE "data/pokedex/entries/094.asm"
-OnixPokedexEntry::       INCLUDE "data/pokedex/entries/095.asm"
-DrowzeePokedexEntry::    INCLUDE "data/pokedex/entries/096.asm"
-HypnoPokedexEntry::      INCLUDE "data/pokedex/entries/097.asm"
-KrabbyPokedexEntry::     INCLUDE "data/pokedex/entries/098.asm"
-KinglerPokedexEntry::    INCLUDE "data/pokedex/entries/099.asm"
-VoltorbPokedexEntry::    INCLUDE "data/pokedex/entries/100.asm"
-ElectrodePokedexEntry::  INCLUDE "data/pokedex/entries/101.asm"
-ExeggcutePokedexEntry::  INCLUDE "data/pokedex/entries/102.asm"
-ExeggutorPokedexEntry::  INCLUDE "data/pokedex/entries/103.asm"
-CubonePokedexEntry::     INCLUDE "data/pokedex/entries/104.asm"
-MarowakPokedexEntry::    INCLUDE "data/pokedex/entries/105.asm"
-HitmonleePokedexEntry::  INCLUDE "data/pokedex/entries/106.asm"
-HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/107.asm"
-LickitungPokedexEntry::  INCLUDE "data/pokedex/entries/108.asm"
-KoffingPokedexEntry::    INCLUDE "data/pokedex/entries/109.asm"
-WeezingPokedexEntry::    INCLUDE "data/pokedex/entries/110.asm"
-RhyhornPokedexEntry::    INCLUDE "data/pokedex/entries/111.asm"
-RhydonPokedexEntry::     INCLUDE "data/pokedex/entries/112.asm"
-ChanseyPokedexEntry::    INCLUDE "data/pokedex/entries/113.asm"
-TangelaPokedexEntry::    INCLUDE "data/pokedex/entries/114.asm"
-KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/115.asm"
-HorseaPokedexEntry::     INCLUDE "data/pokedex/entries/116.asm"
-SeadraPokedexEntry::     INCLUDE "data/pokedex/entries/117.asm"
-GoldeenPokedexEntry::    INCLUDE "data/pokedex/entries/118.asm"
-SeakingPokedexEntry::    INCLUDE "data/pokedex/entries/119.asm"
-StaryuPokedexEntry::     INCLUDE "data/pokedex/entries/120.asm"
-StarmiePokedexEntry::    INCLUDE "data/pokedex/entries/121.asm"
-MrMimePokedexEntry::     INCLUDE "data/pokedex/entries/122.asm"
-ScytherPokedexEntry::    INCLUDE "data/pokedex/entries/123.asm"
-JynxPokedexEntry::       INCLUDE "data/pokedex/entries/124.asm"
-ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/125.asm"
-MagmarPokedexEntry::     INCLUDE "data/pokedex/entries/126.asm"
-PinsirPokedexEntry::     INCLUDE "data/pokedex/entries/127.asm"
-TaurosPokedexEntry::     INCLUDE "data/pokedex/entries/128.asm"
+AlakazamPokedexEntry::   INCLUDE "data/pokedex/entries/alakazam.asm"
+MachopPokedexEntry::     INCLUDE "data/pokedex/entries/machop.asm"
+MachokePokedexEntry::    INCLUDE "data/pokedex/entries/machoke.asm"
+MachampPokedexEntry::    INCLUDE "data/pokedex/entries/machamp.asm"
+BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/bellsprout.asm"
+WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/weepinbell.asm"
+VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/victreebel.asm"
+TentacoolPokedexEntry::  INCLUDE "data/pokedex/entries/tentacool.asm"
+TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/tentacruel.asm"
+GeodudePokedexEntry::    INCLUDE "data/pokedex/entries/geodude.asm"
+GravelerPokedexEntry::   INCLUDE "data/pokedex/entries/graveler.asm"
+GolemPokedexEntry::      INCLUDE "data/pokedex/entries/golem.asm"
+PonytaPokedexEntry::     INCLUDE "data/pokedex/entries/ponyta.asm"
+RapidashPokedexEntry::   INCLUDE "data/pokedex/entries/rapidash.asm"
+SlowpokePokedexEntry::   INCLUDE "data/pokedex/entries/slowpoke.asm"
+SlowbroPokedexEntry::    INCLUDE "data/pokedex/entries/slowbro.asm"
+MagnemitePokedexEntry::  INCLUDE "data/pokedex/entries/magnemite.asm"
+MagnetonPokedexEntry::   INCLUDE "data/pokedex/entries/magneton.asm"
+FarfetchDPokedexEntry::  INCLUDE "data/pokedex/entries/farfetch_d.asm"
+DoduoPokedexEntry::      INCLUDE "data/pokedex/entries/doduo.asm"
+DodrioPokedexEntry::     INCLUDE "data/pokedex/entries/dodrio.asm"
+SeelPokedexEntry::       INCLUDE "data/pokedex/entries/seel.asm"
+DewgongPokedexEntry::    INCLUDE "data/pokedex/entries/dewgong.asm"
+GrimerPokedexEntry::     INCLUDE "data/pokedex/entries/grimer.asm"
+MukPokedexEntry::        INCLUDE "data/pokedex/entries/muk.asm"
+ShellderPokedexEntry::   INCLUDE "data/pokedex/entries/shellder.asm"
+CloysterPokedexEntry::   INCLUDE "data/pokedex/entries/cloyster.asm"
+GastlyPokedexEntry::     INCLUDE "data/pokedex/entries/gastly.asm"
+HaunterPokedexEntry::    INCLUDE "data/pokedex/entries/haunter.asm"
+GengarPokedexEntry::     INCLUDE "data/pokedex/entries/gengar.asm"
+OnixPokedexEntry::       INCLUDE "data/pokedex/entries/onix.asm"
+DrowzeePokedexEntry::    INCLUDE "data/pokedex/entries/drowzee.asm"
+HypnoPokedexEntry::      INCLUDE "data/pokedex/entries/hypno.asm"
+KrabbyPokedexEntry::     INCLUDE "data/pokedex/entries/krabby.asm"
+KinglerPokedexEntry::    INCLUDE "data/pokedex/entries/kingler.asm"
+VoltorbPokedexEntry::    INCLUDE "data/pokedex/entries/voltorb.asm"
+ElectrodePokedexEntry::  INCLUDE "data/pokedex/entries/electrode.asm"
+ExeggcutePokedexEntry::  INCLUDE "data/pokedex/entries/exeggcute.asm"
+ExeggutorPokedexEntry::  INCLUDE "data/pokedex/entries/exeggutor.asm"
+CubonePokedexEntry::     INCLUDE "data/pokedex/entries/cubone.asm"
+MarowakPokedexEntry::    INCLUDE "data/pokedex/entries/marowak.asm"
+HitmonleePokedexEntry::  INCLUDE "data/pokedex/entries/hitmonlee.asm"
+HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/hitmonchan.asm"
+LickitungPokedexEntry::  INCLUDE "data/pokedex/entries/lickitung.asm"
+KoffingPokedexEntry::    INCLUDE "data/pokedex/entries/koffing.asm"
+WeezingPokedexEntry::    INCLUDE "data/pokedex/entries/weezing.asm"
+RhyhornPokedexEntry::    INCLUDE "data/pokedex/entries/rhyhorn.asm"
+RhydonPokedexEntry::     INCLUDE "data/pokedex/entries/rhydon.asm"
+ChanseyPokedexEntry::    INCLUDE "data/pokedex/entries/chansey.asm"
+TangelaPokedexEntry::    INCLUDE "data/pokedex/entries/tangela.asm"
+KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/kangaskhan.asm"
+HorseaPokedexEntry::     INCLUDE "data/pokedex/entries/horsea.asm"
+SeadraPokedexEntry::     INCLUDE "data/pokedex/entries/seadra.asm"
+GoldeenPokedexEntry::    INCLUDE "data/pokedex/entries/goldeen.asm"
+SeakingPokedexEntry::    INCLUDE "data/pokedex/entries/seaking.asm"
+StaryuPokedexEntry::     INCLUDE "data/pokedex/entries/staryu.asm"
+StarmiePokedexEntry::    INCLUDE "data/pokedex/entries/starmie.asm"
+MrMimePokedexEntry::     INCLUDE "data/pokedex/entries/mr__mime.asm"
+ScytherPokedexEntry::    INCLUDE "data/pokedex/entries/scyther.asm"
+JynxPokedexEntry::       INCLUDE "data/pokedex/entries/jynx.asm"
+ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/electabuzz.asm"
+MagmarPokedexEntry::     INCLUDE "data/pokedex/entries/magmar.asm"
+PinsirPokedexEntry::     INCLUDE "data/pokedex/entries/pinsir.asm"
+TaurosPokedexEntry::     INCLUDE "data/pokedex/entries/tauros.asm"
diff --git a/data/pokedex/entries_3.asm b/data/pokedex/entries_3.asm
index 8aa1c28c1..869252baa 100644
--- a/data/pokedex/entries_3.asm
+++ b/data/pokedex/entries_3.asm
@@ -1,64 +1,64 @@
-MagikarpPokedexEntry::   INCLUDE "data/pokedex/entries/129.asm"
-GyaradosPokedexEntry::   INCLUDE "data/pokedex/entries/130.asm"
-LaprasPokedexEntry::     INCLUDE "data/pokedex/entries/131.asm"
-DittoPokedexEntry::      INCLUDE "data/pokedex/entries/132.asm"
-EeveePokedexEntry::      INCLUDE "data/pokedex/entries/133.asm"
-VaporeonPokedexEntry::   INCLUDE "data/pokedex/entries/134.asm"
-JolteonPokedexEntry::    INCLUDE "data/pokedex/entries/135.asm"
-FlareonPokedexEntry::    INCLUDE "data/pokedex/entries/136.asm"
-PorygonPokedexEntry::    INCLUDE "data/pokedex/entries/137.asm"
-OmanytePokedexEntry::    INCLUDE "data/pokedex/entries/138.asm"
-OmastarPokedexEntry::    INCLUDE "data/pokedex/entries/139.asm"
-KabutoPokedexEntry::     INCLUDE "data/pokedex/entries/140.asm"
-KabutopsPokedexEntry::   INCLUDE "data/pokedex/entries/141.asm"
-AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/142.asm"
-SnorlaxPokedexEntry::    INCLUDE "data/pokedex/entries/143.asm"
-ArticunoPokedexEntry::   INCLUDE "data/pokedex/entries/144.asm"
-ZapdosPokedexEntry::     INCLUDE "data/pokedex/entries/145.asm"
-MoltresPokedexEntry::    INCLUDE "data/pokedex/entries/146.asm"
-DratiniPokedexEntry::    INCLUDE "data/pokedex/entries/147.asm"
-DragonairPokedexEntry::  INCLUDE "data/pokedex/entries/148.asm"
-DragonitePokedexEntry::  INCLUDE "data/pokedex/entries/149.asm"
-MewtwoPokedexEntry::     INCLUDE "data/pokedex/entries/150.asm"
-MewPokedexEntry::        INCLUDE "data/pokedex/entries/151.asm"
-ChikoritaPokedexEntry::  INCLUDE "data/pokedex/entries/152.asm"
-BayleefPokedexEntry::    INCLUDE "data/pokedex/entries/153.asm"
-MeganiumPokedexEntry::   INCLUDE "data/pokedex/entries/154.asm"
-CyndaquilPokedexEntry::  INCLUDE "data/pokedex/entries/155.asm"
-QuilavaPokedexEntry::    INCLUDE "data/pokedex/entries/156.asm"
-TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/157.asm"
-TotodilePokedexEntry::   INCLUDE "data/pokedex/entries/158.asm"
-CroconawPokedexEntry::   INCLUDE "data/pokedex/entries/159.asm"
-FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/160.asm"
-SentretPokedexEntry::    INCLUDE "data/pokedex/entries/161.asm"
-FurretPokedexEntry::     INCLUDE "data/pokedex/entries/162.asm"
-HoothootPokedexEntry::   INCLUDE "data/pokedex/entries/163.asm"
-NoctowlPokedexEntry::    INCLUDE "data/pokedex/entries/164.asm"
-LedybaPokedexEntry::     INCLUDE "data/pokedex/entries/165.asm"
-LedianPokedexEntry::     INCLUDE "data/pokedex/entries/166.asm"
-SpinarakPokedexEntry::   INCLUDE "data/pokedex/entries/167.asm"
-AriadosPokedexEntry::    INCLUDE "data/pokedex/entries/168.asm"
-CrobatPokedexEntry::     INCLUDE "data/pokedex/entries/169.asm"
-ChinchouPokedexEntry::   INCLUDE "data/pokedex/entries/170.asm"
-LanturnPokedexEntry::    INCLUDE "data/pokedex/entries/171.asm"
-PichuPokedexEntry::      INCLUDE "data/pokedex/entries/172.asm"
-CleffaPokedexEntry::     INCLUDE "data/pokedex/entries/173.asm"
-IgglybuffPokedexEntry::  INCLUDE "data/pokedex/entries/174.asm"
-TogepiPokedexEntry::     INCLUDE "data/pokedex/entries/175.asm"
-TogeticPokedexEntry::    INCLUDE "data/pokedex/entries/176.asm"
-NatuPokedexEntry::       INCLUDE "data/pokedex/entries/177.asm"
-XatuPokedexEntry::       INCLUDE "data/pokedex/entries/178.asm"
-MareepPokedexEntry::     INCLUDE "data/pokedex/entries/179.asm"
-FlaaffyPokedexEntry::    INCLUDE "data/pokedex/entries/180.asm"
-AmpharosPokedexEntry::   INCLUDE "data/pokedex/entries/181.asm"
-BellossomPokedexEntry::  INCLUDE "data/pokedex/entries/182.asm"
-MarillPokedexEntry::     INCLUDE "data/pokedex/entries/183.asm"
-AzumarillPokedexEntry::  INCLUDE "data/pokedex/entries/184.asm"
-SudowoodoPokedexEntry::  INCLUDE "data/pokedex/entries/185.asm"
-PolitoedPokedexEntry::   INCLUDE "data/pokedex/entries/186.asm"
-HoppipPokedexEntry::     INCLUDE "data/pokedex/entries/187.asm"
-SkiploomPokedexEntry::   INCLUDE "data/pokedex/entries/188.asm"
-JumpluffPokedexEntry::   INCLUDE "data/pokedex/entries/189.asm"
-AipomPokedexEntry::      INCLUDE "data/pokedex/entries/190.asm"
-SunkernPokedexEntry::    INCLUDE "data/pokedex/entries/191.asm"
-SunfloraPokedexEntry::   INCLUDE "data/pokedex/entries/192.asm"
+MagikarpPokedexEntry::   INCLUDE "data/pokedex/entries/magikarp.asm"
+GyaradosPokedexEntry::   INCLUDE "data/pokedex/entries/gyarados.asm"
+LaprasPokedexEntry::     INCLUDE "data/pokedex/entries/lapras.asm"
+DittoPokedexEntry::      INCLUDE "data/pokedex/entries/ditto.asm"
+EeveePokedexEntry::      INCLUDE "data/pokedex/entries/eevee.asm"
+VaporeonPokedexEntry::   INCLUDE "data/pokedex/entries/vaporeon.asm"
+JolteonPokedexEntry::    INCLUDE "data/pokedex/entries/jolteon.asm"
+FlareonPokedexEntry::    INCLUDE "data/pokedex/entries/flareon.asm"
+PorygonPokedexEntry::    INCLUDE "data/pokedex/entries/porygon.asm"
+OmanytePokedexEntry::    INCLUDE "data/pokedex/entries/omanyte.asm"
+OmastarPokedexEntry::    INCLUDE "data/pokedex/entries/omastar.asm"
+KabutoPokedexEntry::     INCLUDE "data/pokedex/entries/kabuto.asm"
+KabutopsPokedexEntry::   INCLUDE "data/pokedex/entries/kabutops.asm"
+AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/aerodactyl.asm"
+SnorlaxPokedexEntry::    INCLUDE "data/pokedex/entries/snorlax.asm"
+ArticunoPokedexEntry::   INCLUDE "data/pokedex/entries/articuno.asm"
+ZapdosPokedexEntry::     INCLUDE "data/pokedex/entries/zapdos.asm"
+MoltresPokedexEntry::    INCLUDE "data/pokedex/entries/moltres.asm"
+DratiniPokedexEntry::    INCLUDE "data/pokedex/entries/dratini.asm"
+DragonairPokedexEntry::  INCLUDE "data/pokedex/entries/dragonair.asm"
+DragonitePokedexEntry::  INCLUDE "data/pokedex/entries/dragonite.asm"
+MewtwoPokedexEntry::     INCLUDE "data/pokedex/entries/mewtwo.asm"
+MewPokedexEntry::        INCLUDE "data/pokedex/entries/mew.asm"
+ChikoritaPokedexEntry::  INCLUDE "data/pokedex/entries/chikorita.asm"
+BayleefPokedexEntry::    INCLUDE "data/pokedex/entries/bayleef.asm"
+MeganiumPokedexEntry::   INCLUDE "data/pokedex/entries/meganium.asm"
+CyndaquilPokedexEntry::  INCLUDE "data/pokedex/entries/cyndaquil.asm"
+QuilavaPokedexEntry::    INCLUDE "data/pokedex/entries/quilava.asm"
+TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/typhlosion.asm"
+TotodilePokedexEntry::   INCLUDE "data/pokedex/entries/totodile.asm"
+CroconawPokedexEntry::   INCLUDE "data/pokedex/entries/croconaw.asm"
+FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/feraligatr.asm"
+SentretPokedexEntry::    INCLUDE "data/pokedex/entries/sentret.asm"
+FurretPokedexEntry::     INCLUDE "data/pokedex/entries/furret.asm"
+HoothootPokedexEntry::   INCLUDE "data/pokedex/entries/hoothoot.asm"
+NoctowlPokedexEntry::    INCLUDE "data/pokedex/entries/noctowl.asm"
+LedybaPokedexEntry::     INCLUDE "data/pokedex/entries/ledyba.asm"
+LedianPokedexEntry::     INCLUDE "data/pokedex/entries/ledian.asm"
+SpinarakPokedexEntry::   INCLUDE "data/pokedex/entries/spinarak.asm"
+AriadosPokedexEntry::    INCLUDE "data/pokedex/entries/ariados.asm"
+CrobatPokedexEntry::     INCLUDE "data/pokedex/entries/crobat.asm"
+ChinchouPokedexEntry::   INCLUDE "data/pokedex/entries/chinchou.asm"
+LanturnPokedexEntry::    INCLUDE "data/pokedex/entries/lanturn.asm"
+PichuPokedexEntry::      INCLUDE "data/pokedex/entries/pichu.asm"
+CleffaPokedexEntry::     INCLUDE "data/pokedex/entries/cleffa.asm"
+IgglybuffPokedexEntry::  INCLUDE "data/pokedex/entries/igglybuff.asm"
+TogepiPokedexEntry::     INCLUDE "data/pokedex/entries/togepi.asm"
+TogeticPokedexEntry::    INCLUDE "data/pokedex/entries/togetic.asm"
+NatuPokedexEntry::       INCLUDE "data/pokedex/entries/natu.asm"
+XatuPokedexEntry::       INCLUDE "data/pokedex/entries/xatu.asm"
+MareepPokedexEntry::     INCLUDE "data/pokedex/entries/mareep.asm"
+FlaaffyPokedexEntry::    INCLUDE "data/pokedex/entries/flaaffy.asm"
+AmpharosPokedexEntry::   INCLUDE "data/pokedex/entries/ampharos.asm"
+BellossomPokedexEntry::  INCLUDE "data/pokedex/entries/bellossom.asm"
+MarillPokedexEntry::     INCLUDE "data/pokedex/entries/marill.asm"
+AzumarillPokedexEntry::  INCLUDE "data/pokedex/entries/azumarill.asm"
+SudowoodoPokedexEntry::  INCLUDE "data/pokedex/entries/sudowoodo.asm"
+PolitoedPokedexEntry::   INCLUDE "data/pokedex/entries/politoed.asm"
+HoppipPokedexEntry::     INCLUDE "data/pokedex/entries/hoppip.asm"
+SkiploomPokedexEntry::   INCLUDE "data/pokedex/entries/skiploom.asm"
+JumpluffPokedexEntry::   INCLUDE "data/pokedex/entries/jumpluff.asm"
+AipomPokedexEntry::      INCLUDE "data/pokedex/entries/aipom.asm"
+SunkernPokedexEntry::    INCLUDE "data/pokedex/entries/sunkern.asm"
+SunfloraPokedexEntry::   INCLUDE "data/pokedex/entries/sunflora.asm"
diff --git a/data/pokedex/entries_4.asm b/data/pokedex/entries_4.asm
index 846a4b91a..240f87e3e 100644
--- a/data/pokedex/entries_4.asm
+++ b/data/pokedex/entries_4.asm
@@ -1,59 +1,59 @@
-YanmaPokedexEntry::      INCLUDE "data/pokedex/entries/193.asm"
-WooperPokedexEntry::     INCLUDE "data/pokedex/entries/194.asm"
-QuagsirePokedexEntry::   INCLUDE "data/pokedex/entries/195.asm"
-EspeonPokedexEntry::     INCLUDE "data/pokedex/entries/196.asm"
-UmbreonPokedexEntry::    INCLUDE "data/pokedex/entries/197.asm"
-MurkrowPokedexEntry::    INCLUDE "data/pokedex/entries/198.asm"
-SlowkingPokedexEntry::   INCLUDE "data/pokedex/entries/199.asm"
-MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/200.asm"
-UnownPokedexEntry::      INCLUDE "data/pokedex/entries/201.asm"
-WobbuffetPokedexEntry::  INCLUDE "data/pokedex/entries/202.asm"
-GirafarigPokedexEntry::  INCLUDE "data/pokedex/entries/203.asm"
-PinecoPokedexEntry::     INCLUDE "data/pokedex/entries/204.asm"
-ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/205.asm"
-DunsparcePokedexEntry::  INCLUDE "data/pokedex/entries/206.asm"
-GligarPokedexEntry::     INCLUDE "data/pokedex/entries/207.asm"
-SteelixPokedexEntry::    INCLUDE "data/pokedex/entries/208.asm"
-SnubbullPokedexEntry::   INCLUDE "data/pokedex/entries/209.asm"
-GranbullPokedexEntry::   INCLUDE "data/pokedex/entries/210.asm"
-QwilfishPokedexEntry::   INCLUDE "data/pokedex/entries/211.asm"
-ScizorPokedexEntry::     INCLUDE "data/pokedex/entries/212.asm"
-ShucklePokedexEntry::    INCLUDE "data/pokedex/entries/213.asm"
-HeracrossPokedexEntry::  INCLUDE "data/pokedex/entries/214.asm"
-SneaselPokedexEntry::    INCLUDE "data/pokedex/entries/215.asm"
-TeddiursaPokedexEntry::  INCLUDE "data/pokedex/entries/216.asm"
-UrsaringPokedexEntry::   INCLUDE "data/pokedex/entries/217.asm"
-SlugmaPokedexEntry::     INCLUDE "data/pokedex/entries/218.asm"
-MagcargoPokedexEntry::   INCLUDE "data/pokedex/entries/219.asm"
-SwinubPokedexEntry::     INCLUDE "data/pokedex/entries/220.asm"
-PiloswinePokedexEntry::  INCLUDE "data/pokedex/entries/221.asm"
-CorsolaPokedexEntry::    INCLUDE "data/pokedex/entries/222.asm"
-RemoraidPokedexEntry::   INCLUDE "data/pokedex/entries/223.asm"
-OctilleryPokedexEntry::  INCLUDE "data/pokedex/entries/224.asm"
-DelibirdPokedexEntry::   INCLUDE "data/pokedex/entries/225.asm"
-MantinePokedexEntry::    INCLUDE "data/pokedex/entries/226.asm"
-SkarmoryPokedexEntry::   INCLUDE "data/pokedex/entries/227.asm"
-HoundourPokedexEntry::   INCLUDE "data/pokedex/entries/228.asm"
-HoundoomPokedexEntry::   INCLUDE "data/pokedex/entries/229.asm"
-KingdraPokedexEntry::    INCLUDE "data/pokedex/entries/230.asm"
-PhanpyPokedexEntry::     INCLUDE "data/pokedex/entries/231.asm"
-DonphanPokedexEntry::    INCLUDE "data/pokedex/entries/232.asm"
-Porygon2PokedexEntry::   INCLUDE "data/pokedex/entries/233.asm"
-StantlerPokedexEntry::   INCLUDE "data/pokedex/entries/234.asm"
-SmearglePokedexEntry::   INCLUDE "data/pokedex/entries/235.asm"
-TyroguePokedexEntry::    INCLUDE "data/pokedex/entries/236.asm"
-HitmontopPokedexEntry::  INCLUDE "data/pokedex/entries/237.asm"
-SmoochumPokedexEntry::   INCLUDE "data/pokedex/entries/238.asm"
-ElekidPokedexEntry::     INCLUDE "data/pokedex/entries/239.asm"
-MagbyPokedexEntry::      INCLUDE "data/pokedex/entries/240.asm"
-MiltankPokedexEntry::    INCLUDE "data/pokedex/entries/241.asm"
-BlisseyPokedexEntry::    INCLUDE "data/pokedex/entries/242.asm"
-RaikouPokedexEntry::     INCLUDE "data/pokedex/entries/243.asm"
-EnteiPokedexEntry::      INCLUDE "data/pokedex/entries/244.asm"
-SuicunePokedexEntry::    INCLUDE "data/pokedex/entries/245.asm"
-LarvitarPokedexEntry::   INCLUDE "data/pokedex/entries/246.asm"
-PupitarPokedexEntry::    INCLUDE "data/pokedex/entries/247.asm"
-TyranitarPokedexEntry::  INCLUDE "data/pokedex/entries/248.asm"
-LugiaPokedexEntry::      INCLUDE "data/pokedex/entries/249.asm"
-HoOhPokedexEntry::       INCLUDE "data/pokedex/entries/250.asm"
-CelebiPokedexEntry::     INCLUDE "data/pokedex/entries/251.asm"
+YanmaPokedexEntry::      INCLUDE "data/pokedex/entries/yanma.asm"
+WooperPokedexEntry::     INCLUDE "data/pokedex/entries/wooper.asm"
+QuagsirePokedexEntry::   INCLUDE "data/pokedex/entries/quagsire.asm"
+EspeonPokedexEntry::     INCLUDE "data/pokedex/entries/espeon.asm"
+UmbreonPokedexEntry::    INCLUDE "data/pokedex/entries/umbreon.asm"
+MurkrowPokedexEntry::    INCLUDE "data/pokedex/entries/murkrow.asm"
+SlowkingPokedexEntry::   INCLUDE "data/pokedex/entries/slowking.asm"
+MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/misdreavus.asm"
+UnownPokedexEntry::      INCLUDE "data/pokedex/entries/unown.asm"
+WobbuffetPokedexEntry::  INCLUDE "data/pokedex/entries/wobbuffet.asm"
+GirafarigPokedexEntry::  INCLUDE "data/pokedex/entries/girafarig.asm"
+PinecoPokedexEntry::     INCLUDE "data/pokedex/entries/pineco.asm"
+ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/forretress.asm"
+DunsparcePokedexEntry::  INCLUDE "data/pokedex/entries/dunsparce.asm"
+GligarPokedexEntry::     INCLUDE "data/pokedex/entries/gligar.asm"
+SteelixPokedexEntry::    INCLUDE "data/pokedex/entries/steelix.asm"
+SnubbullPokedexEntry::   INCLUDE "data/pokedex/entries/snubbull.asm"
+GranbullPokedexEntry::   INCLUDE "data/pokedex/entries/granbull.asm"
+QwilfishPokedexEntry::   INCLUDE "data/pokedex/entries/qwilfish.asm"
+ScizorPokedexEntry::     INCLUDE "data/pokedex/entries/scizor.asm"
+ShucklePokedexEntry::    INCLUDE "data/pokedex/entries/shuckle.asm"
+HeracrossPokedexEntry::  INCLUDE "data/pokedex/entries/heracross.asm"
+SneaselPokedexEntry::    INCLUDE "data/pokedex/entries/sneasel.asm"
+TeddiursaPokedexEntry::  INCLUDE "data/pokedex/entries/teddiursa.asm"
+UrsaringPokedexEntry::   INCLUDE "data/pokedex/entries/ursaring.asm"
+SlugmaPokedexEntry::     INCLUDE "data/pokedex/entries/slugma.asm"
+MagcargoPokedexEntry::   INCLUDE "data/pokedex/entries/magcargo.asm"
+SwinubPokedexEntry::     INCLUDE "data/pokedex/entries/swinub.asm"
+PiloswinePokedexEntry::  INCLUDE "data/pokedex/entries/piloswine.asm"
+CorsolaPokedexEntry::    INCLUDE "data/pokedex/entries/corsola.asm"
+RemoraidPokedexEntry::   INCLUDE "data/pokedex/entries/remoraid.asm"
+OctilleryPokedexEntry::  INCLUDE "data/pokedex/entries/octillery.asm"
+DelibirdPokedexEntry::   INCLUDE "data/pokedex/entries/delibird.asm"
+MantinePokedexEntry::    INCLUDE "data/pokedex/entries/mantine.asm"
+SkarmoryPokedexEntry::   INCLUDE "data/pokedex/entries/skarmory.asm"
+HoundourPokedexEntry::   INCLUDE "data/pokedex/entries/houndour.asm"
+HoundoomPokedexEntry::   INCLUDE "data/pokedex/entries/houndoom.asm"
+KingdraPokedexEntry::    INCLUDE "data/pokedex/entries/kingdra.asm"
+PhanpyPokedexEntry::     INCLUDE "data/pokedex/entries/phanpy.asm"
+DonphanPokedexEntry::    INCLUDE "data/pokedex/entries/donphan.asm"
+Porygon2PokedexEntry::   INCLUDE "data/pokedex/entries/porygon2.asm"
+StantlerPokedexEntry::   INCLUDE "data/pokedex/entries/stantler.asm"
+SmearglePokedexEntry::   INCLUDE "data/pokedex/entries/smeargle.asm"
+TyroguePokedexEntry::    INCLUDE "data/pokedex/entries/tyrogue.asm"
+HitmontopPokedexEntry::  INCLUDE "data/pokedex/entries/hitmontop.asm"
+SmoochumPokedexEntry::   INCLUDE "data/pokedex/entries/smoochum.asm"
+ElekidPokedexEntry::     INCLUDE "data/pokedex/entries/elekid.asm"
+MagbyPokedexEntry::      INCLUDE "data/pokedex/entries/magby.asm"
+MiltankPokedexEntry::    INCLUDE "data/pokedex/entries/miltank.asm"
+BlisseyPokedexEntry::    INCLUDE "data/pokedex/entries/blissey.asm"
+RaikouPokedexEntry::     INCLUDE "data/pokedex/entries/raikou.asm"
+EnteiPokedexEntry::      INCLUDE "data/pokedex/entries/entei.asm"
+SuicunePokedexEntry::    INCLUDE "data/pokedex/entries/suicune.asm"
+LarvitarPokedexEntry::   INCLUDE "data/pokedex/entries/larvitar.asm"
+PupitarPokedexEntry::    INCLUDE "data/pokedex/entries/pupitar.asm"
+TyranitarPokedexEntry::  INCLUDE "data/pokedex/entries/tyranitar.asm"
+LugiaPokedexEntry::      INCLUDE "data/pokedex/entries/lugia.asm"
+HoOhPokedexEntry::       INCLUDE "data/pokedex/entries/ho_oh.asm"
+CelebiPokedexEntry::     INCLUDE "data/pokedex/entries/celebi.asm"