1 files changed, 1265 insertions, 2 deletions

diff --git a/pokered.asm b/pokered.asm
index 2a51e878..536c06be 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -9176,7 +9176,1270 @@ PlayAttackAnimation: ; 6F07
 INCBIN "baserom.gbc",$3EF12,$40000 - $3EF12
 
 SECTION "bank10",DATA,BANK[$10]
-INCBIN "baserom.gbc",$40000,$1024
+INCBIN "baserom.gbc",$40000,$47E
+
+PokedexEntryPointers: ; 447E
+	dw RhydonDexEntry
+	dw KangaskhanDexEntry
+	dw NidoranMDexEntry
+	dw ClefairyDexEntry
+	dw SpearowDexEntry
+	dw VoltorbDexEntry
+	dw NidokingDexEntry
+	dw SlowbroDexEntry
+	dw IvysaurDexEntry
+	dw ExeggutorDexEntry
+	dw LickitungDexEntry
+	dw ExeggcuteDexEntry
+	dw GrimerDexEntry
+	dw GengarDexEntry
+	dw NidoranFDexEntry
+	dw NidoqueenDexEntry
+	dw CuboneDexEntry
+	dw RhyhornDexEntry
+	dw LaprasDexEntry
+	dw ArcanineDexEntry
+	dw MewDexEntry
+	dw GyaradosDexEntry
+	dw ShellderDexEntry
+	dw TentacoolDexEntry
+	dw GastlyDexEntry
+	dw ScytherDexEntry
+	dw StaryuDexEntry
+	dw BlastoiseDexEntry
+	dw PinsirDexEntry
+	dw TangelaDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw GrowlitheDexEntry
+	dw OnixDexEntry
+	dw FearowDexEntry
+	dw PidgeyDexEntry
+	dw SlowpokeDexEntry
+	dw KadabraDexEntry
+	dw GravelerDexEntry
+	dw ChanseyDexEntry
+	dw MachokeDexEntry
+	dw MrMimeDexEntry
+	dw HitmonleeDexEntry
+	dw HitmonchanDexEntry
+	dw ArbokDexEntry
+	dw ParasectDexEntry
+	dw PsyduckDexEntry
+	dw DrowzeeDexEntry
+	dw GolemDexEntry
+	dw MissingNoDexEntry
+	dw MagmarDexEntry
+	dw MissingNoDexEntry
+	dw ElectabuzzDexEntry
+	dw MagnetonDexEntry
+	dw KoffingDexEntry
+	dw MissingNoDexEntry
+	dw MankeyDexEntry
+	dw SeelDexEntry
+	dw DiglettDexEntry
+	dw TaurosDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw FarfetchdDexEntry
+	dw VenonatDexEntry
+	dw DragoniteDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw DoduoDexEntry
+	dw PoliwagDexEntry
+	dw JynxDexEntry
+	dw MoltresDexEntry
+	dw ArticunoDexEntry
+	dw ZapdosDexEntry
+	dw DittoDexEntry
+	dw MeowthDexEntry
+	dw KrabbyDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw VulpixDexEntry
+	dw NinetalesDexEntry
+	dw PikachuDexEntry
+	dw RaichuDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw DratiniDexEntry
+	dw DragonairDexEntry
+	dw KabutoDexEntry
+	dw KabutopsDexEntry
+	dw HorseaDexEntry
+	dw SeadraDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw SandshrewDexEntry
+	dw SandslashDexEntry
+	dw OmanyteDexEntry
+	dw OmastarDexEntry
+	dw JigglypuffDexEntry
+	dw WigglytuffDexEntry
+	dw EeveeDexEntry
+	dw FlareonDexEntry
+	dw JolteonDexEntry
+	dw VaporeonDexEntry
+	dw MachopDexEntry
+	dw ZubatDexEntry
+	dw EkansDexEntry
+	dw ParasDexEntry
+	dw PoliwhirlDexEntry
+	dw PoliwrathDexEntry
+	dw WeedleDexEntry
+	dw KakunaDexEntry
+	dw BeedrillDexEntry
+	dw MissingNoDexEntry
+	dw DodrioDexEntry
+	dw PrimeapeDexEntry
+	dw DugtrioDexEntry
+	dw VenomothDexEntry
+	dw DewgongDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw CaterpieDexEntry
+	dw MetapodDexEntry
+	dw ButterfreeDexEntry
+	dw MachampDexEntry
+	dw MissingNoDexEntry
+	dw GolduckDexEntry
+	dw HypnoDexEntry
+	dw GolbatDexEntry
+	dw MewtwoDexEntry
+	dw SnorlaxDexEntry
+	dw MagikarpDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MukDexEntry
+	dw MissingNoDexEntry
+	dw KinglerDexEntry
+	dw CloysterDexEntry
+	dw MissingNoDexEntry
+	dw ElectrodeDexEntry
+	dw ClefableDexEntry
+	dw WeezingDexEntry
+	dw PersianDexEntry
+	dw MarowakDexEntry
+	dw MissingNoDexEntry
+	dw HaunterDexEntry
+	dw AbraDexEntry
+	dw AlakazamDexEntry
+	dw PidgeottoDexEntry
+	dw PidgeotDexEntry
+	dw StarmieDexEntry
+	dw BulbasaurDexEntry
+	dw VenusaurDexEntry
+	dw TentacruelDexEntry
+	dw MissingNoDexEntry
+	dw GoldeenDexEntry
+	dw SeakingDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw PonytaDexEntry
+	dw RapidashDexEntry
+	dw RattataDexEntry
+	dw RaticateDexEntry
+	dw NidorinoDexEntry
+	dw NidorinaDexEntry
+	dw GeodudeDexEntry
+	dw PorygonDexEntry
+	dw AerodactylDexEntry
+	dw MissingNoDexEntry
+	dw MagnemiteDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw CharmanderDexEntry
+	dw SquirtleDexEntry
+	dw CharmeleonDexEntry
+	dw WartortleDexEntry
+	dw CharizardDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw MissingNoDexEntry
+	dw OddishDexEntry
+	dw GloomDexEntry
+	dw VileplumeDexEntry
+	dw BellsproutDexEntry
+	dw WeepinbellDexEntry
+	dw VictreebelDexEntry
+
+; string: species name
+; height in feet, inches
+; weight in pounds
+; text entry
+
+RhydonDexEntry:
+	db "DRILL@"
+	db 6,3
+	dw 2650
+	TX_FAR _RhydonDexEntry
+	db "@"
+
+KangaskhanDexEntry:
+	db "PARENT@"
+	db 7,3
+	dw 1760
+	TX_FAR _KangaskhanDexEntry
+	db "@"
+
+NidoranMDexEntry:
+	db "POISON PIN@"
+	db 1,8
+	dw 200
+	TX_FAR _NidoranMDexEntry
+	db "@"
+
+ClefairyDexEntry:
+	db "FAIRY@"
+	db 2,0
+	dw 170
+	TX_FAR _ClefairyDexEntry
+	db "@"
+
+SpearowDexEntry:
+	db "TINY BIRD@"
+	db 1,0
+	dw 40
+	TX_FAR _SpearowDexEntry
+	db "@"
+
+VoltorbDexEntry:
+	db "BALL@"
+	db 1,8
+	dw 230
+	TX_FAR _VoltorbDexEntry
+	db "@"
+
+NidokingDexEntry:
+	db "DRILL@"
+	db 4,7
+	dw 1370
+	TX_FAR _NidokingDexEntry
+	db "@"
+
+SlowbroDexEntry:
+	db "HERMITCRAB@"
+	db 5,3
+	dw 1730
+	TX_FAR _SlowbroDexEntry
+	db "@"
+
+IvysaurDexEntry:
+	db "SEED@"
+	db 3,3
+	dw 290
+	TX_FAR _IvysaurDexEntry
+	db "@"
+
+ExeggutorDexEntry:
+	db "COCONUT@"
+	db 6,7
+	dw 2650
+	TX_FAR _ExeggutorDexEntry
+	db "@"
+
+LickitungDexEntry:
+	db "LICKING@"
+	db 3,11
+	dw 1440
+	TX_FAR _LickitungDexEntry
+	db "@"
+
+ExeggcuteDexEntry:
+	db "EGG@"
+	db 1,4
+	dw 60
+	TX_FAR _ExeggcuteDexEntry
+	db "@"
+
+GrimerDexEntry:
+	db "SLUDGE@"
+	db 2,11
+	dw 660
+	TX_FAR _GrimerDexEntry
+	db "@"
+
+GengarDexEntry:
+	db "SHADOW@"
+	db 4,11
+	dw 890
+	TX_FAR _GengarDexEntry
+	db "@"
+
+NidoranFDexEntry:
+	db "POISON PIN@"
+	db 1,4
+	dw 150
+	TX_FAR _NidoranFDexEntry
+	db "@"
+
+NidoqueenDexEntry:
+	db "DRILL@"
+	db 4,3
+	dw 1320
+	TX_FAR _NidoqueenDexEntry
+	db "@"
+
+CuboneDexEntry:
+	db "LONELY@"
+	db 1,4
+	dw 140
+	TX_FAR _CuboneDexEntry
+	db "@"
+
+RhyhornDexEntry:
+	db "SPIKES@"
+	db 3,3
+	dw 2540
+	TX_FAR _RhyhornDexEntry
+	db "@"
+
+LaprasDexEntry:
+	db "TRANSPORT@"
+	db 8,2
+	dw 4850
+	TX_FAR _LaprasDexEntry
+	db "@"
+
+ArcanineDexEntry:
+	db "LEGENDARY@"
+	db 6,3
+	dw 3420
+	TX_FAR _ArcanineDexEntry
+	db "@"
+
+MewDexEntry:
+	db "NEW SPECIE@"
+	db 1,4
+	dw 90
+	TX_FAR _MewDexEntry
+	db "@"
+
+GyaradosDexEntry:
+	db "ATROCIOUS@"
+	db 21,4
+	dw 5180
+	TX_FAR _GyaradosDexEntry
+	db "@"
+
+ShellderDexEntry:
+	db "BIVALVE@"
+	db 1,0
+	dw 90
+	TX_FAR _ShellderDexEntry
+	db "@"
+
+TentacoolDexEntry:
+	db "JELLYFISH@"
+	db 2,11
+	dw 1000
+	TX_FAR _TentacoolDexEntry
+	db "@"
+
+GastlyDexEntry:
+	db "GAS@"
+	db 4,3
+	dw 2
+	TX_FAR _GastlyDexEntry
+	db "@"
+
+ScytherDexEntry:
+	db "MANTIS@"
+	db 4,11
+	dw 1230
+	TX_FAR _ScytherDexEntry
+	db "@"
+
+StaryuDexEntry:
+	db "STARSHAPE@"
+	db 2,7
+	dw 760
+	TX_FAR _StaryuDexEntry
+	db "@"
+
+BlastoiseDexEntry:
+	db "SHELLFISH@"
+	db 5,3
+	dw 1890
+	TX_FAR _BlastoiseDexEntry
+	db "@"
+
+PinsirDexEntry:
+	db "STAGBEETLE@"
+	db 4,11
+	dw 1210
+	TX_FAR _PinsirDexEntry
+	db "@"
+
+TangelaDexEntry:
+	db "VINE@"
+	db 3,3
+	dw 770
+	TX_FAR _TangelaDexEntry
+	db "@"
+
+GrowlitheDexEntry:
+	db "PUPPY@"
+	db 2,4
+	dw 420
+	TX_FAR _GrowlitheDexEntry
+	db "@"
+
+OnixDexEntry:
+	db "ROCK SNAKE@"
+	db 28,10
+	dw 4630
+	TX_FAR _OnixDexEntry
+	db "@"
+
+FearowDexEntry:
+	db "BEAK@"
+	db 3,11
+	dw 840
+	TX_FAR _FearowDexEntry
+	db "@"
+
+PidgeyDexEntry:
+	db "TINY BIRD@"
+	db 1,0
+	dw 40
+	TX_FAR _PidgeyDexEntry
+	db "@"
+
+SlowpokeDexEntry:
+	db "DOPEY@"
+	db 3,11
+	dw 790
+	TX_FAR _SlowpokeDexEntry
+	db "@"
+
+KadabraDexEntry:
+	db "PSI@"
+	db 4,3
+	dw 1250
+	TX_FAR _KadabraDexEntry
+	db "@"
+
+GravelerDexEntry:
+	db "ROCK@"
+	db 3,3
+	dw 2320
+	TX_FAR _GravelerDexEntry
+	db "@"
+
+ChanseyDexEntry:
+	db "EGG@"
+	db 3,7
+	dw 760
+	TX_FAR _ChanseyDexEntry
+	db "@"
+
+MachokeDexEntry:
+	db "SUPERPOWER@"
+	db 4,11
+	dw 1550
+	TX_FAR _MachokeDexEntry
+	db "@"
+
+MrMimeDexEntry:
+	db "BARRIER@"
+	db 4,3
+	dw 1200
+	TX_FAR _MrMimeDexEntry
+	db "@"
+
+HitmonleeDexEntry:
+	db "KICKING@"
+	db 4,11
+	dw 1100
+	TX_FAR _HitmonleeDexEntry
+	db "@"
+
+HitmonchanDexEntry:
+	db "PUNCHING@"
+	db 4,7
+	dw 1110
+	TX_FAR _HitmonchanDexEntry
+	db "@"
+
+ArbokDexEntry:
+	db "COBRA@"
+	db 11,6
+	dw 1430
+	TX_FAR _ArbokDexEntry
+	db "@"
+
+ParasectDexEntry:
+	db "MUSHROOM@"
+	db 3,3
+	dw 650
+	TX_FAR _ParasectDexEntry
+	db "@"
+
+PsyduckDexEntry:
+	db "DUCK@"
+	db 2,7
+	dw 430
+	TX_FAR _PsyduckDexEntry
+	db "@"
+
+DrowzeeDexEntry:
+	db "HYPNOSIS@"
+	db 3,3
+	dw 710
+	TX_FAR _DrowzeeDexEntry
+	db "@"
+
+GolemDexEntry:
+	db "MEGATON@"
+	db 4,7
+	dw 6620
+	TX_FAR _GolemDexEntry
+	db "@"
+
+MagmarDexEntry:
+	db "SPITFIRE@"
+	db 4,3
+	dw 980
+	TX_FAR _MagmarDexEntry
+	db "@"
+
+ElectabuzzDexEntry:
+	db "ELECTRIC@"
+	db 3,7
+	dw 660
+	TX_FAR _ElectabuzzDexEntry
+	db "@"
+
+MagnetonDexEntry:
+	db "MAGNET@"
+	db 3,3
+	dw 1320
+	TX_FAR _MagnetonDexEntry
+	db "@"
+
+KoffingDexEntry:
+	db "POISON GAS@"
+	db 2,0
+	dw 20
+	TX_FAR _KoffingDexEntry
+	db "@"
+
+MankeyDexEntry:
+	db "PIG MONKEY@"
+	db 1,8
+	dw 620
+	TX_FAR _MankeyDexEntry
+	db "@"
+
+SeelDexEntry:
+	db "SEA LION@"
+	db 3,7
+	dw 1980
+	TX_FAR _SeelDexEntry
+	db "@"
+
+DiglettDexEntry:
+	db "MOLE@"
+	db 0,8
+	dw 20
+	TX_FAR _DiglettDexEntry
+	db "@"
+
+TaurosDexEntry:
+	db "WILD BULL@"
+	db 4,7
+	dw 1950
+	TX_FAR _TaurosDexEntry
+	db "@"
+
+FarfetchdDexEntry:
+	db "WILD DUCK@"
+	db 2,7
+	dw 330
+	TX_FAR _FarfetchdDexEntry
+	db "@"
+
+VenonatDexEntry:
+	db "INSECT@"
+	db 3,3
+	dw 660
+	TX_FAR _VenonatDexEntry
+	db "@"
+
+DragoniteDexEntry:
+	db "DRAGON@"
+	db 7,3
+	dw 4630
+	TX_FAR _DragoniteDexEntry
+	db "@"
+
+DoduoDexEntry:
+	db "TWIN BIRD@"
+	db 4,7
+	dw 860
+	TX_FAR _DoduoDexEntry
+	db "@"
+
+PoliwagDexEntry:
+	db "TADPOLE@"
+	db 2,0
+	dw 270
+	TX_FAR _PoliwagDexEntry
+	db "@"
+
+JynxDexEntry:
+	db "HUMANSHAPE@"
+	db 4,7
+	dw 900
+	TX_FAR _JynxDexEntry
+	db "@"
+
+MoltresDexEntry:
+	db "FLAME@"
+	db 6,7
+	dw 1320
+	TX_FAR _MoltresDexEntry
+	db "@"
+
+ArticunoDexEntry:
+	db "FREEZE@"
+	db 5,7
+	dw 1220
+	TX_FAR _ArticunoDexEntry
+	db "@"
+
+ZapdosDexEntry:
+	db "ELECTRIC@"
+	db 5,3
+	dw 1160
+	TX_FAR _ZapdosDexEntry
+	db "@"
+
+DittoDexEntry:
+	db "TRANSFORM@"
+	db 1,0
+	dw 90
+	TX_FAR _DittoDexEntry
+	db "@"
+
+MeowthDexEntry:
+	db "SCRATCHCAT@"
+	db 1,4
+	dw 90
+	TX_FAR _MeowthDexEntry
+	db "@"
+
+KrabbyDexEntry:
+	db "RIVER CRAB@"
+	db 1,4
+	dw 140
+	TX_FAR _KrabbyDexEntry
+	db "@"
+
+VulpixDexEntry:
+	db "FOX@"
+	db 2,0
+	dw 220
+	TX_FAR _VulpixDexEntry
+	db "@"
+
+NinetalesDexEntry:
+	db "FOX@"
+	db 3,7
+	dw 440
+	TX_FAR _NinetalesDexEntry
+	db "@"
+
+PikachuDexEntry:
+	db "MOUSE@"
+	db 1,4
+	dw 130
+	TX_FAR _PikachuDexEntry
+	db "@"
+
+RaichuDexEntry:
+	db "MOUSE@"
+	db 2,7
+	dw 660
+	TX_FAR _RaichuDexEntry
+	db "@"
+
+DratiniDexEntry:
+	db "DRAGON@"
+	db 5,11
+	dw 70
+	TX_FAR _DratiniDexEntry
+	db "@"
+
+DragonairDexEntry:
+	db "DRAGON@"
+	db 13,1
+	dw 360
+	TX_FAR _DragonairDexEntry
+	db "@"
+
+KabutoDexEntry:
+	db "SHELLFISH@"
+	db 1,8
+	dw 250
+	TX_FAR _KabutoDexEntry
+	db "@"
+
+KabutopsDexEntry:
+	db "SHELLFISH@"
+	db 4,3
+	dw 890
+	TX_FAR _KabutopsDexEntry
+	db "@"
+
+HorseaDexEntry:
+	db "DRAGON@"
+	db 1,4
+	dw 180
+	TX_FAR _HorseaDexEntry
+	db "@"
+
+SeadraDexEntry:
+	db "DRAGON@"
+	db 3,11
+	dw 550
+	TX_FAR _SeadraDexEntry
+	db "@"
+
+SandshrewDexEntry:
+	db "MOUSE@"
+	db 2,0
+	dw 260
+	TX_FAR _SandshrewDexEntry
+	db "@"
+
+SandslashDexEntry:
+	db "MOUSE@"
+	db 3,3
+	dw 650
+	TX_FAR _SandslashDexEntry
+	db "@"
+
+OmanyteDexEntry:
+	db "SPIRAL@"
+	db 1,4
+	dw 170
+	TX_FAR _OmanyteDexEntry
+	db "@"
+
+OmastarDexEntry:
+	db "SPIRAL@"
+	db 3,3
+	dw 770
+	TX_FAR _OmastarDexEntry
+	db "@"
+
+JigglypuffDexEntry:
+	db "BALLOON@"
+	db 1,8
+	dw 120
+	TX_FAR _JigglypuffDexEntry
+	db "@"
+
+WigglytuffDexEntry:
+	db "BALLOON@"
+	db 3,3
+	dw 260
+	TX_FAR _WigglytuffDexEntry
+	db "@"
+
+EeveeDexEntry:
+	db "EVOLUTION@"
+	db 1,0
+	dw 140
+	TX_FAR _EeveeDexEntry
+	db "@"
+
+FlareonDexEntry:
+	db "FLAME@"
+	db 2,11
+	dw 550
+	TX_FAR _FlareonDexEntry
+	db "@"
+
+JolteonDexEntry:
+	db "LIGHTNING@"
+	db 2,7
+	dw 540
+	TX_FAR _JolteonDexEntry
+	db "@"
+
+VaporeonDexEntry:
+	db "BUBBLE JET@"
+	db 3,3
+	dw 640
+	TX_FAR _VaporeonDexEntry
+	db "@"
+
+MachopDexEntry:
+	db "SUPERPOWER@"
+	db 2,7
+	dw 430
+	TX_FAR _MachopDexEntry
+	db "@"
+
+ZubatDexEntry:
+	db "BAT@"
+	db 2,7
+	dw 170
+	TX_FAR _ZubatDexEntry
+	db "@"
+
+EkansDexEntry:
+	db "SNAKE@"
+	db 6,7
+	dw 150
+	TX_FAR _EkansDexEntry
+	db "@"
+
+ParasDexEntry:
+	db "MUSHROOM@"
+	db 1,0
+	dw 120
+	TX_FAR _ParasDexEntry
+	db "@"
+
+PoliwhirlDexEntry:
+	db "TADPOLE@"
+	db 3,3
+	dw 440
+	TX_FAR _PoliwhirlDexEntry
+	db "@"
+
+PoliwrathDexEntry:
+	db "TADPOLE@"
+	db 4,3
+	dw 1190
+	TX_FAR _PoliwrathDexEntry
+	db "@"
+
+WeedleDexEntry:
+	db "HAIRY BUG@"
+	db 1,0
+	dw 70
+	TX_FAR _WeedleDexEntry
+	db "@"
+
+KakunaDexEntry:
+	db "COCOON@"
+	db 2,0
+	dw 220
+	TX_FAR _KakunaDexEntry
+	db "@"
+
+BeedrillDexEntry:
+	db "POISON BEE@"
+	db 3,3
+	dw 650
+	TX_FAR _BeedrillDexEntry
+	db "@"
+
+DodrioDexEntry:
+	db "TRIPLEBIRD@"
+	db 5,11
+	dw 1880
+	TX_FAR _DodrioDexEntry
+	db "@"
+
+PrimeapeDexEntry:
+	db "PIG MONKEY@"
+	db 3,3
+	dw 710
+	TX_FAR _PrimeapeDexEntry
+	db "@"
+
+DugtrioDexEntry:
+	db "MOLE@"
+	db 2,4
+	dw 730
+	TX_FAR _DugtrioDexEntry
+	db "@"
+
+VenomothDexEntry:
+	db "POISONMOTH@"
+	db 4,11
+	dw 280
+	TX_FAR _VenomothDexEntry
+	db "@"
+
+DewgongDexEntry:
+	db "SEA LION@"
+	db 5,7
+	dw 2650
+	TX_FAR _DewgongDexEntry
+	db "@"
+
+CaterpieDexEntry:
+	db "WORM@"
+	db 1,0
+	dw 60
+	TX_FAR _CaterpieDexEntry
+	db "@"
+
+MetapodDexEntry:
+	db "COCOON@"
+	db 2,4
+	dw 220
+	TX_FAR _MetapodDexEntry
+	db "@"
+
+ButterfreeDexEntry:
+	db "BUTTERFLY@"
+	db 3,7
+	dw 710
+	TX_FAR _ButterfreeDexEntry
+	db "@"
+
+MachampDexEntry:
+	db "SUPERPOWER@"
+	db 5,3
+	dw 2870
+	TX_FAR _MachampDexEntry
+	db "@"
+
+GolduckDexEntry:
+	db "DUCK@"
+	db 5,7
+	dw 1690
+	TX_FAR _GolduckDexEntry
+	db "@"
+
+HypnoDexEntry:
+	db "HYPNOSIS@"
+	db 5,3
+	dw 1670
+	TX_FAR _HypnoDexEntry
+	db "@"
+
+GolbatDexEntry:
+	db "BAT@"
+	db 5,3
+	dw 1210
+	TX_FAR _GolbatDexEntry
+	db "@"
+
+MewtwoDexEntry:
+	db "GENETIC@"
+	db 6,7
+	dw 2690
+	TX_FAR _MewtwoDexEntry
+	db "@"
+
+SnorlaxDexEntry:
+	db "SLEEPING@"
+	db 6,11
+	dw 10140
+	TX_FAR _SnorlaxDexEntry
+	db "@"
+
+MagikarpDexEntry:
+	db "FISH@"
+	db 2,11
+	dw 220
+	TX_FAR _MagikarpDexEntry
+	db "@"
+
+MukDexEntry:
+	db "SLUDGE@"
+	db 3,11
+	dw 660
+	TX_FAR _MukDexEntry
+	db "@"
+
+KinglerDexEntry:
+	db "PINCER@"
+	db 4,3
+	dw 1320
+	TX_FAR _KinglerDexEntry
+	db "@"
+
+CloysterDexEntry:
+	db "BIVALVE@"
+	db 4,11
+	dw 2920
+	TX_FAR _CloysterDexEntry
+	db "@"
+
+ElectrodeDexEntry:
+	db "BALL@"
+	db 3,11
+	dw 1470
+	TX_FAR _ElectrodeDexEntry
+	db "@"
+
+ClefableDexEntry:
+	db "FAIRY@"
+	db 4,3
+	dw 880
+	TX_FAR _ClefableDexEntry
+	db "@"
+
+WeezingDexEntry:
+	db "POISON GAS@"
+	db 3,11
+	dw 210
+	TX_FAR _WeezingDexEntry
+	db "@"
+
+PersianDexEntry:
+	db "CLASSY CAT@"
+	db 3,3
+	dw 710
+	TX_FAR _PersianDexEntry
+	db "@"
+
+MarowakDexEntry:
+	db "BONEKEEPER@"
+	db 3,3
+	dw 990
+	TX_FAR _MarowakDexEntry
+	db "@"
+
+HaunterDexEntry:
+	db "GAS@"
+	db 5,3
+	dw 2
+	TX_FAR _HaunterDexEntry
+	db "@"
+
+AbraDexEntry:
+	db "PSI@"
+	db 2,11
+	dw 430
+	TX_FAR _AbraDexEntry
+	db "@"
+
+AlakazamDexEntry:
+	db "PSI@"
+	db 4,11
+	dw 1060
+	TX_FAR _AlakazamDexEntry
+	db "@"
+
+PidgeottoDexEntry:
+	db "BIRD@"
+	db 3,7
+	dw 660
+	TX_FAR _PidgeottoDexEntry
+	db "@"
+
+PidgeotDexEntry:
+	db "BIRD@"
+	db 4,11
+	dw 870
+	TX_FAR _PidgeotDexEntry
+	db "@"
+
+StarmieDexEntry:
+	db "MYSTERIOUS@"
+	db 3,7
+	dw 1760
+	TX_FAR _StarmieDexEntry
+	db "@"
+
+BulbasaurDexEntry:
+	db "SEED@"
+	db 2,4
+	dw 150
+	TX_FAR _BulbasaurDexEntry
+	db "@"
+
+VenusaurDexEntry:
+	db "SEED@"
+	db 6,7
+	dw 2210
+	TX_FAR _VenusaurDexEntry
+	db "@"
+
+TentacruelDexEntry:
+	db "JELLYFISH@"
+	db 5,3
+	dw 1210
+	TX_FAR _TentacruelDexEntry
+	db "@"
+
+GoldeenDexEntry:
+	db "GOLDFISH@"
+	db 2,0
+	dw 330
+	TX_FAR _GoldeenDexEntry
+	db "@"
+
+SeakingDexEntry:
+	db "GOLDFISH@"
+	db 4,3
+	dw 860
+	TX_FAR _SeakingDexEntry
+	db "@"
+
+PonytaDexEntry:
+	db "FIRE HORSE@"
+	db 3,3
+	dw 660
+	TX_FAR _PonytaDexEntry
+	db "@"
+
+RapidashDexEntry:
+	db "FIRE HORSE@"
+	db 5,7
+	dw 2090
+	TX_FAR _RapidashDexEntry
+	db "@"
+
+RattataDexEntry:
+	db "RAT@"
+	db 1,0
+	dw 80
+	TX_FAR _RattataDexEntry
+	db "@"
+
+RaticateDexEntry:
+	db "RAT@"
+	db 2,4
+	dw 410
+	TX_FAR _RaticateDexEntry
+	db "@"
+
+NidorinoDexEntry:
+	db "POISON PIN@"
+	db 2,11
+	dw 430
+	TX_FAR _NidorinoDexEntry
+	db "@"
+
+NidorinaDexEntry:
+	db "POISON PIN@"
+	db 2,7
+	dw 440
+	TX_FAR _NidorinaDexEntry
+	db "@"
+
+GeodudeDexEntry:
+	db "ROCK@"
+	db 1,4
+	dw 440
+	TX_FAR _GeodudeDexEntry
+	db "@"
+
+PorygonDexEntry:
+	db "VIRTUAL@"
+	db 2,7
+	dw 800
+	TX_FAR _PorygonDexEntry
+	db "@"
+
+AerodactylDexEntry:
+	db "FOSSIL@"
+	db 5,11
+	dw 1300
+	TX_FAR _AerodactylDexEntry
+	db "@"
+
+MagnemiteDexEntry:
+	db "MAGNET@"
+	db 1,0
+	dw 130
+	TX_FAR _MagnemiteDexEntry
+	db "@"
+
+CharmanderDexEntry:
+	db "LIZARD@"
+	db 2,0
+	dw 190
+	TX_FAR _CharmanderDexEntry
+	db "@"
+
+SquirtleDexEntry:
+	db "TINYTURTLE@"
+	db 1,8
+	dw 200
+	TX_FAR _SquirtleDexEntry
+	db "@"
+
+CharmeleonDexEntry:
+	db "FLAME@"
+	db 3,7
+	dw 420
+	TX_FAR _CharmeleonDexEntry
+	db "@"
+
+WartortleDexEntry:
+	db "TURTLE@"
+	db 3,3
+	dw 500
+	TX_FAR _WartortleDexEntry
+	db "@"
+
+CharizardDexEntry:
+	db "FLAME@"
+	db 5,7
+	dw 2000
+	TX_FAR _CharizardDexEntry
+	db "@"
+
+OddishDexEntry:
+	db "WEED@"
+	db 1,8
+	dw 120
+	TX_FAR _OddishDexEntry
+	db "@"
+
+GloomDexEntry:
+	db "WEED@"
+	db 2,7
+	dw 190
+	TX_FAR _GloomDexEntry
+	db "@"
+
+VileplumeDexEntry:
+	db "FLOWER@"
+	db 3,11
+	dw 410
+	TX_FAR _VileplumeDexEntry
+	db "@"
+
+BellsproutDexEntry:
+	db "FLOWER@"
+	db 2,4
+	dw 90
+	TX_FAR _BellsproutDexEntry
+	db "@"
+
+WeepinbellDexEntry:
+	db "FLYCATCHER@"
+	db 3,3
+	dw 140
+	TX_FAR _WeepinbellDexEntry
+	db "@"
+
+VictreebelDexEntry:
+	db "FLYCATCHER@"
+	db 5,7
+	dw 340
+	TX_FAR _VictreebelDexEntry
+	db "@"
+
+MissingNoDexEntry:
+	db "???@"
+	db 10 ; 1.0 m
+	db 100 ; 10.0 kg
+	db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
+
+INCBIN "baserom.gbc",$40FF9,$1024 - $FF9
+
 PokedexOrder: ; 5024
 	db DEX_RHYDON
 	db DEX_KANGASKHAN
@@ -11311,7 +12574,7 @@ SECTION "bank2A",DATA,BANK[$2A]
 INCBIN "baserom.gbc",$A8000,$4000
 
 SECTION "bank2B",DATA,BANK[$2B]
-INCBIN "baserom.gbc",$AC000,$4000
+INCLUDE "text/pokedex1.asm"
 
 SECTION "bank2C",DATA,BANK[$2C]
 INCBIN "baserom.gbc",$B0000,$4000