More consistent data tables

23 files changed, 294 insertions, 332 deletions

diff --git a/data/audio/notes.asm b/data/audio/notes.asm
index bc5e682c9..543672a4a 100644
--- a/data/audio/notes.asm
+++ b/data/audio/notes.asm
@@ -1,3 +1,4 @@
+FrequencyTable: ; e8d80
 	dw 0     ; __
 	dw $f82c ; C_
 	dw $f89d ; C#
@@ -23,3 +24,4 @@
 	dw $fdac ; A_
 	dw $fdcd ; A#
 	dw $fded ; B_
+; e8db2
diff --git a/data/audio/wave_samples.asm b/data/audio/wave_samples.asm
index abf0925ce..8c5bafa75 100644
--- a/data/audio/wave_samples.asm
+++ b/data/audio/wave_samples.asm
@@ -1,3 +1,4 @@
+WaveSamples: ; e8db2
 	; these are streams of 32 4-bit values used as wavepatterns
 	; nothing interesting here!
 	dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1
@@ -10,3 +11,4 @@
 	dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14
 	dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5
 	dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1
+; e8e52
diff --git a/data/mystery_gift/decos.asm b/data/mystery_gift/decos.asm
index 18cc0ac30..bdd4694c6 100644
--- a/data/mystery_gift/decos.asm
+++ b/data/mystery_gift/decos.asm
@@ -1,3 +1,4 @@
+MysteryGiftDecos: ; 2c74a
 	db DECOFLAG_PIKACHU_DOLL
 	db DECOFLAG_BULBASAUR_DOLL
 	db DECOFLAG_CHARMANDER_DOLL
@@ -35,3 +36,5 @@
 	db DECOFLAG_PIKACHU_BED
 	db DECOFLAG_GRIMER_DOLL
 	db DECOFLAG_UNOWN_DOLL
+MysteryGiftDecosEnd
+; 2c76f
diff --git a/data/mystery_gift/items.asm b/data/mystery_gift/items.asm
index 1970d6826..b2379071e 100644
--- a/data/mystery_gift/items.asm
+++ b/data/mystery_gift/items.asm
@@ -1,3 +1,4 @@
+MysteryGiftItems: ; 2c725
 	db BERRY
 	db PRZCUREBERRY
 	db MINT_BERRY
@@ -35,3 +36,5 @@
 	db RARE_CANDY
 	db BLUESKY_MAIL
 	db MIRAGE_MAIL
+MysteryGiftItemsEnd:
+; 2c74a
diff --git a/data/pokedex/entries.asm b/data/pokedex/entries.asm
index c54f5e245..a12cdd3f4 100644
--- a/data/pokedex/entries.asm
+++ b/data/pokedex/entries.asm
@@ -4,22 +4,269 @@ INCLUDE "includes.asm"
 SECTION "Pokedex Entries 001-064", ROMX
 
 PokedexEntries1::
-INCLUDE "data/pokedex/entries_1.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"
 
 
 SECTION "Pokedex Entries 065-128", ROMX
 
 PokedexEntries2::
-INCLUDE "data/pokedex/entries_2.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"
 
 
 SECTION "Pokedex Entries 129-192", ROMX
 
 PokedexEntries3::
-INCLUDE "data/pokedex/entries_3.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"
 
 
 SECTION "Pokedex Entries 193-251", ROMX
 
 PokedexEntries4::
-INCLUDE "data/pokedex/entries_4.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"
diff --git a/data/pokedex/entries_1.asm b/data/pokedex/entries_1.asm
deleted file mode 100644
index 7f3c04cd6..000000000
--- a/data/pokedex/entries_1.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 881986d92..000000000
--- a/data/pokedex/entries_2.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 869252baa..000000000
--- a/data/pokedex/entries_3.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 240f87e3e..000000000
--- a/data/pokedex/entries_4.asm
+++ /dev/null
@@ -1,59 +0,0 @@
-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"
diff --git a/data/pokedex/entry_pointers.asm b/data/pokedex/entry_pointers.asm
index 5a432e661..c4ddc7280 100644
--- a/data/pokedex/entry_pointers.asm
+++ b/data/pokedex/entry_pointers.asm
@@ -1,77 +1,5 @@
-GetDexEntryPointer: ; 44333
-; return dex entry pointer b:de
-	push hl
-	ld hl, PokedexDataPointerTable
-	ld a, b
-	dec a
-	ld d, 0
-	ld e, a
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	push de
-	rlca
-	rlca
-	and $3
-	ld hl, .PokedexEntryBanks
-	ld d, 0
-	ld e, a
-	add hl, de
-	ld b, [hl]
-	pop de
-	pop hl
-	ret
-
-.PokedexEntryBanks: ; 44351
-
-GLOBAL PokedexEntries1
-GLOBAL PokedexEntries2
-GLOBAL PokedexEntries3
-GLOBAL PokedexEntries4
-
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
-
-GetDexEntryPagePointer: ; 44355
-	call GetDexEntryPointer ; b:de
-	push hl
-	ld h, d
-	ld l, e
-; skip species name
-.loop1
-	ld a, b
-	call GetFarByte
-	inc hl
-	cp "@"
-	jr nz, .loop1
-; skip height and weight
-rept 4
-	inc hl
-endr
-; if c != 1: skip entry
-	dec c
-	jr z, .done
-; skip entry
-.loop2
-	ld a, b
-	call GetFarByte
-	inc hl
-	cp "@"
-	jr nz, .loop2
-
-.done
-	ld d, h
-	ld e, l
-	pop hl
-	ret
-
 PokedexDataPointerTable: ; 0x44378
-; Pointers to all the Pokedex entries.
-
+; entries correspond to constants/pokemon_constants.asm
 	dw BulbasaurPokedexEntry
 	dw IvysaurPokedexEntry
 	dw VenusaurPokedexEntry
@@ -323,3 +251,4 @@ PokedexDataPointerTable: ; 0x44378
 	dw LugiaPokedexEntry
 	dw HoOhPokedexEntry
 	dw CelebiPokedexEntry
+; 0x4456e
diff --git a/data/pokedex/order_alpha.asm b/data/pokedex/order_alpha.asm
index bab0a981d..8fcb0acd1 100644
--- a/data/pokedex/order_alpha.asm
+++ b/data/pokedex/order_alpha.asm
@@ -1,5 +1,6 @@
-; Every Pokemon sorted alphabetically by name.
+; Every Pokémon sorted alphabetically by name.
 
+AlphabeticalPokedexOrder: ; 0x40c65
 	db ABRA
 	db AERODACTYL
 	db AIPOM
@@ -251,3 +252,4 @@
 	db YANMA
 	db ZAPDOS
 	db ZUBAT
+; 0x40d60
diff --git a/data/pokedex/order_new.asm b/data/pokedex/order_new.asm
index a98a658cd..bf7e3d298 100644
--- a/data/pokedex/order_new.asm
+++ b/data/pokedex/order_new.asm
@@ -1,5 +1,6 @@
-; Every Pokemon sorted in New Pokedex Order.
+; Every Pokémon sorted in New Pokédex Order.
 
+NewPokedexOrder: ; 0x40d60
 	db CHIKORITA
 	db BAYLEEF
 	db MEGANIUM
@@ -251,3 +252,4 @@
 	db MEWTWO
 	db MEW
 	db CELEBI
+; 0x40e5b
diff --git a/data/time_capsule/catch_rate_items.asm b/data/time_capsule/catch_rate_items.asm
index 1db3818f8..fbab7d434 100644
--- a/data/time_capsule/catch_rate_items.asm
+++ b/data/time_capsule/catch_rate_items.asm
@@ -2,6 +2,7 @@
 ; catch rate as an item. However, if the catch rate appears in this table, the
 ; item associated with the table entry is used instead.
 
+TimeCapsule_CatchRateItems: ; 28785
 	db ITEM_19, LEFTOVERS
 	db ITEM_2D, BITTER_BERRY
 	db ITEM_32, GOLD_BERRY
@@ -15,3 +16,4 @@
 	db ITEM_FA, BERRY
 	db -1,      BERRY
 	db  0 ; end
+; 2879e
diff --git a/data/time_capsule/mon_order.asm b/data/time_capsule/mon_order.asm
index 2769794e6..e40ba0273 100644
--- a/data/time_capsule/mon_order.asm
+++ b/data/time_capsule/mon_order.asm
@@ -1,3 +1,4 @@
+Pokered_MonIndices: ; fb91c
 	db RHYDON
 	db KANGASKHAN
 	db NIDORAN_M
@@ -251,3 +252,4 @@
 	db QWILFISH
 	db WOBBUFFET
 	db WOBBUFFET
+; fba18
diff --git a/data/time_capsule/special_stats.asm b/data/time_capsule/special_stats.asm
index 7da90e1c9..9998692ab 100644
--- a/data/time_capsule/special_stats.asm
+++ b/data/time_capsule/special_stats.asm
@@ -1,4 +1,6 @@
 ; The original base Special stat for each Pokémon from Red/Blue
+
+KantoMonSpecials: ; fb656
 	db  65 ; BULBASAUR
 	db  80 ; IVYSAUR
 	db 100 ; VENUSAUR
@@ -150,3 +152,4 @@
 	db 100 ; DRAGONITE
 	db 154 ; MEWTWO
 	db 100 ; MEW
+; fb6ed
diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm
index 1b74fb3ee..c3cdeaa8a 100644
--- a/data/wild/bug_contest_mons.asm
+++ b/data/wild/bug_contest_mons.asm
@@ -1,3 +1,4 @@
+ContestMons: ; 97d87
 	;   %, species,   min, max
 	db 20, CATERPIE,    7, 18
 	db 20, WEEDLE,      7, 18
@@ -10,3 +11,4 @@
 	db  5, SCYTHER,    13, 14
 	db  5, PINSIR,     13, 14
 	db -1, VENOMOTH,   30, 40
+; 97db3
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index f241dd5d8..be435b048 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -1,5 +1,7 @@
 ; Johto Pokémon in grass
 
+JohtoGrassWildMons: ; 0x2a5e9
+
 	map SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index a4d957ef0..d6e11c3a0 100644
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -1,5 +1,7 @@
 ; Johto Pokémon in water
 
+JohtoWaterWildMons: ; 0x2b11d
+
 	map RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
 	db 15, WOOPER
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index e06627d19..415514748 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -1,5 +1,7 @@
 ; Kanto Pokémon in grass
 
+KantoGrassWildMons: ; 0x2b274
+
 	map DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 558d56a26..71fab48fb 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -1,5 +1,7 @@
 ; Kanto Pokémon in water
 
+KantoWaterWildMons: ; 0x2b7f7
+
 	map TOHJO_FALLS
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index 403ebef25..ee213bff5 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -12,6 +12,7 @@ endr
 	db 0
 endm
 
+RoamMaps: ; 2a40f
 	roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46
 	roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31
 	roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36
@@ -29,3 +30,4 @@ endm
 	roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46
 	roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29
 	db -1 ; end
+; 2a4a0
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm
index 61d0d8532..a26417f64 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -1,4 +1,6 @@
-; swarms in grass
+; Pokémon swarms in grass
+
+SwarmGrassWildMons: ; 0x2b8d0
 
 ; Dunsparce swarm
 	map DARK_CAVE_VIOLET_ENTRANCE
diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm
index 67751b2bd..3f69af512 100644
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -1,4 +1,6 @@
-; swarms in water
+; Pokémon swarms in water
+
+SwarmWaterWildMons: ; 0x2b92f
 
 	; No swarms encountered while surfing in Crystal