thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few minor changes

Browse source 
Reworks the Pokedex to accommodate for the regional forms, changes a title screen graphic, and cleans up a few base stat files (will do the rest later). Also revised a few dex entries (special thanks to my girlfriend for Gyopin's!)
This commit is contained in:
MementoMartha 2023-03-29 11:35:41 +01:00
parent 492a410235
commit c9b01f2c64
14 changed files with 439 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

55
data/pokemon/base_stats.asm
View file

@ -9,8 +9,22 @@ INCLUDE "data/pokemon/base_stats/charizard.asm"
INCLUDE "data/pokemon/base_stats/squirtle.asm"
INCLUDE "data/pokemon/base_stats/wartortle.asm"
INCLUDE "data/pokemon/base_stats/totartle.asm"
INCLUDE "data/pokemon/base_stats/pikachu.asm"
INCLUDE "data/pokemon/base_stats/raichu.asm"
; INCLUDE "data/pokemon/base_stats/raichua.asm"
INCLUDE "data/pokemon/base_stats/gorochu.asm"
INCLUDE "data/pokemon/base_stats/eevee.asm"
INCLUDE "data/pokemon/base_stats/vaporeon.asm"
INCLUDE "data/pokemon/base_stats/jolteon.asm"
INCLUDE "data/pokemon/base_stats/flareon.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"
INCLUDE "data/pokemon/base_stats/umbreon.asm"
INCLUDE "data/pokemon/base_stats/leafeon.asm"
INCLUDE "data/pokemon/base_stats/glaceon.asm"
INCLUDE "data/pokemon/base_stats/sylveon.asm"
INCLUDE "data/pokemon/base_stats/rattata.asm"
INCLUDE "data/pokemon/base_stats/raticate.asm"
; INCLUDE "data/pokemon/base_stats/raticatea.asm"
INCLUDE "data/pokemon/base_stats/pidgey.asm"
INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
INCLUDE "data/pokemon/base_stats/pidgeot.asm"
@ -24,15 +38,13 @@ INCLUDE "data/pokemon/base_stats/konya.asm"
INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/perrserker.asm"
INCLUDE "data/pokemon/base_stats/pikachu.asm"
INCLUDE "data/pokemon/base_stats/raichu.asm"
INCLUDE "data/pokemon/base_stats/gorochu.asm"
INCLUDE "data/pokemon/base_stats/spearow.asm"
INCLUDE "data/pokemon/base_stats/fearow.asm"
INCLUDE "data/pokemon/base_stats/ekans.asm"
INCLUDE "data/pokemon/base_stats/arbok.asm"
INCLUDE "data/pokemon/base_stats/sandshrew.asm"
INCLUDE "data/pokemon/base_stats/sandslash.asm"
; INCLUDE "data/pokemon/base_stats/sandslasha.asm"
INCLUDE "data/pokemon/base_stats/nidoranf.asm"
INCLUDE "data/pokemon/base_stats/nidorina.asm"
INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
@ -47,6 +59,7 @@ INCLUDE "data/pokemon/base_stats/crobat.asm"
INCLUDE "data/pokemon/base_stats/geodude.asm"
INCLUDE "data/pokemon/base_stats/graveler.asm"
INCLUDE "data/pokemon/base_stats/golem.asm"
; INCLUDE "data/pokemon/base_stats/golema.asm"
INCLUDE "data/pokemon/base_stats/para.asm"
INCLUDE "data/pokemon/base_stats/paras.asm"
INCLUDE "data/pokemon/base_stats/parasect.asm"
@ -57,9 +70,11 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
INCLUDE "data/pokemon/base_stats/mikon.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
INCLUDE "data/pokemon/base_stats/ninetales.asm"
; INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
INCLUDE "data/pokemon/base_stats/pudi.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
; INCLUDE "data/pokemon/base_stats/arcanineh.asm"
INCLUDE "data/pokemon/base_stats/mankey.asm"
INCLUDE "data/pokemon/base_stats/primeape.asm"
INCLUDE "data/pokemon/base_stats/annihilape.asm"
@ -90,8 +105,15 @@ INCLUDE "data/pokemon/base_stats/poliwag.asm"
INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
INCLUDE "data/pokemon/base_stats/poliwrath.asm"
INCLUDE "data/pokemon/base_stats/politoed.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/onix.asm"
INCLUDE "data/pokemon/base_stats/steelix.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
; INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
INCLUDE "data/pokemon/base_stats/wiglett.asm"
INCLUDE "data/pokemon/base_stats/wugtrio.asm"
INCLUDE "data/pokemon/base_stats/drowzee.asm"
@ -101,16 +123,11 @@ INCLUDE "data/pokemon/base_stats/gaotora.asm"
INCLUDE "data/pokemon/base_stats/gorotora.asm"
INCLUDE "data/pokemon/base_stats/voltorb.asm"
INCLUDE "data/pokemon/base_stats/electrode.asm"
; INCLUDE "data/pokemon/base_stats/electrodeh.asm"
INCLUDE "data/pokemon/base_stats/tentacool.asm"
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
INCLUDE "data/pokemon/base_stats/toedscool.asm"
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/onix.asm"
INCLUDE "data/pokemon/base_stats/steelix.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
@ -126,10 +143,13 @@ INCLUDE "data/pokemon/base_stats/krabby.asm"
INCLUDE "data/pokemon/base_stats/kingler.asm"
INCLUDE "data/pokemon/base_stats/slowpoke.asm"
INCLUDE "data/pokemon/base_stats/slowbro.asm"
; INCLUDE "data/pokemon/base_stats/slowbrog.asm"
INCLUDE "data/pokemon/base_stats/slowking.asm"
; INCLUDE "data/pokemon/base_stats/slowkingg.asm"
INCLUDE "data/pokemon/base_stats/puchikoon.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm"
; INCLUDE "data/pokemon/base_stats/rapidashg.asm"
INCLUDE "data/pokemon/base_stats/monja.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm"
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
@ -142,12 +162,15 @@ INCLUDE "data/pokemon/base_stats/haunter.asm"
INCLUDE "data/pokemon/base_stats/gengar.asm"
INCLUDE "data/pokemon/base_stats/cubone.asm"
INCLUDE "data/pokemon/base_stats/marowak.asm"
; INCLUDE "data/pokemon/base_stats/marowaka.asm"
INCLUDE "data/pokemon/base_stats/guardia.asm"
INCLUDE "data/pokemon/base_stats/betobebii.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm"
INCLUDE "data/pokemon/base_stats/muk.asm"
; INCLUDE "data/pokemon/base_stats/muka.asm"
INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm"
; INCLUDE "data/pokemon/base_stats/weezingg.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
@ -171,6 +194,7 @@ INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/jagg.asm"
INCLUDE "data/pokemon/base_stats/exeggcute.asm"
INCLUDE "data/pokemon/base_stats/exeggutor.asm"
; INCLUDE "data/pokemon/base_stats/exeggutora.asm"
INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
INCLUDE "data/pokemon/base_stats/rhydon.asm"
INCLUDE "data/pokemon/base_stats/rhyperior.asm"
@ -182,12 +206,16 @@ INCLUDE "data/pokemon/base_stats/purakkusu.asm"
INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/trampel.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
; INCLUDE "data/pokemon/base_stats/taurosp.asm"
; INCLUDE "data/pokemon/base_stats/taurospa.asm"
; INCLUDE "data/pokemon/base_stats/taurospb.asm"
INCLUDE "data/pokemon/base_stats/chansey.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/skimper.asm"
INCLUDE "data/pokemon/base_stats/bawligua.asm"
INCLUDE "data/pokemon/base_stats/cryithan.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
; INCLUDE "data/pokemon/base_stats/mrmimeg.asm"
INCLUDE "data/pokemon/base_stats/mrrime.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/buu.asm"
@ -196,15 +224,6 @@ INCLUDE "data/pokemon/base_stats/electivire.asm"
INCLUDE "data/pokemon/base_stats/magmar.asm"
INCLUDE "data/pokemon/base_stats/magmortar.asm"
INCLUDE "data/pokemon/base_stats/lapras.asm"
INCLUDE "data/pokemon/base_stats/eevee.asm"
INCLUDE "data/pokemon/base_stats/vaporeon.asm"
INCLUDE "data/pokemon/base_stats/jolteon.asm"
INCLUDE "data/pokemon/base_stats/flareon.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"
INCLUDE "data/pokemon/base_stats/umbreon.asm"
INCLUDE "data/pokemon/base_stats/leafeon.asm"
INCLUDE "data/pokemon/base_stats/glaceon.asm"
INCLUDE "data/pokemon/base_stats/sylveon.asm"
INCLUDE "data/pokemon/base_stats/porygon.asm"
INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/porygonz.asm"

9
data/pokemon/base_stats/arcanineh.asm
View file

@ -1,6 +1,6 @@
db DEX_ARCANINE_H ; pokedex id
db 95, 115, 80, 90, 80
db 95, 115, 80, 90, 80
; hp atk def spd spc
db FIRE, ROCK ; type
@ -14,9 +14,10 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, DOUBLE_EDGE, RAGE, DRAGON_RAGE, \
DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \
REST, ROCK_SLIDE, SUBSTITUTE
; end
db BANK(ArcanineHPicFront)

14
data/pokemon/base_stats/melmetal.asm
View file

@ -1,11 +1,11 @@
db DEX_MELMETAL ; pokedex id
db 135, 143, 143, 34, 65
db 135, 143, 143, 34, 65
; hp atk def spd spc
db STEEL, STEEL ; type
db 75 ; catch rate
db 213 ; base exp
db 3 ; catch rate
db 243 ; base exp
INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions
dw MelmetalPicFront, MelmetalPicBack
@ -14,10 +14,10 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE, \
MEGA_PUNCH, SUBMISSION, HYPER_BEAM, MEGA_KICK, BODY_SLAM, ICE_BEAM, \
SOLAR_BEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, ROCK_SLIDE, \
SUBSTITUTE
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, ICE_BEAM, \
HYPER_BEAM, SUBMISSION, RAGE, SOLARBEAM, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, REST, THUNDER_WAVE, ROCK_SLIDE, SUBSTITUTE
; end
db BANK(MelmetalPicFront)

7
data/pokemon/base_stats/meltan.asm
View file

@ -4,8 +4,8 @@
; hp atk def spd spc
db STEEL, STEEL ; type
db 75 ; catch rate
db 213 ; base exp
db 3 ; catch rate
db 131 ; base exp
INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions
dw MeltanPicFront, MeltanPicBack
@ -14,7 +14,8 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE
tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \
REST, THUNDER_WAVE, SUBSTITUTE
; end
db BANK(MeltanPicFront)

2
data/pokemon/base_stats/screamtail.asm
View file

@ -1,6 +1,6 @@
db DEX_SCREAM_TAIL ; pokedex id
db 115, 65, 99, 111, 65
db 115, 65, 99, 111, 115
; hp atk def spd spc
db FAIRY, PSYCHIC_TYPE ; type

10
data/pokemon/base_stats/taurosp.asm
View file

@ -1,6 +1,6 @@
db DEX_TAUROS_P ; pokedex id
db 75, 110, 105, 100, 70
db 75, 110, 105, 100, 70
; hp atk def spd spc
db FIGHTING, FIGHTING ; type
@ -15,10 +15,10 @@
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER
ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, STRENGTH
; end
db BANK(TaurosPPicFront)

17
data/pokemon/base_stats/taurospa.asm
View file

@ -7,19 +7,20 @@
db 45 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/taurospw.pic", 0, 1 ; sprite dimensions
dw TaurosPWPicFront, TaurosPWPicBack
INCBIN "gfx/pokemon/front/taurospa.pic", 0, 1 ; sprite dimensions
dw TaurosPAPicFront, TaurosPAPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER, BUBBLE_BEAM, WATER_GUN, SURF
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
SUBMISSION, COUNTER, RAGE, THUNDERBOLT, THUNDER, \
EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, BIDE, \
FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, SURF, \
STRENGTH
; end
db BANK(TaurosPWPicFront)
assert BANK(TaurosPWPicFront) == BANK(TaurosPWPicBack)
db BANK(TaurosPAPicFront)
assert BANK(TaurosPAPicFront) == BANK(TaurosPAPicBack)

8
data/pokemon/base_stats/taurospb.asm
View file

@ -15,10 +15,10 @@
; tm/hm learnset
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \
THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \
STRENGTH, SUBMISSION, COUNTER
ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \
REST, SUBSTITUTE, STRENGTH
; end
db BANK(TaurosPBPicFront)

55
data/pokemon/menu_icons.asm
View file

@ -9,8 +9,22 @@ MonPartyData:
nybble ICON_WATER ; Squirtle
nybble ICON_WATER ; Wartortle
nybble ICON_WATER ; Totartle
nybble ICON_FAIRY ; Pikachu
nybble ICON_FAIRY ; Raichu
; nybble ICON_FAIRY ; Raichu-A
nybble ICON_FAIRY ; Gorochu
nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon
nybble ICON_QUADRUPED ; Flareon
nybble ICON_QUADRUPED ; Espeon
nybble ICON_QUADRUPED ; Umbreon
nybble ICON_QUADRUPED ; Leafeon
nybble ICON_QUADRUPED ; Glaceon
nybble ICON_QUADRUPED ; Sylveon
nybble ICON_QUADRUPED ; Rattata
nybble ICON_QUADRUPED ; Raticate
; nybble ICON_QUADRUPED ; Raticate-A
nybble ICON_BIRD ; Pidgey
nybble ICON_BIRD ; Pidgeotto
nybble ICON_BIRD ; Pidgeot
@ -24,15 +38,13 @@ MonPartyData:
nybble ICON_MON ; Meowth
nybble ICON_MON ; Persian
nybble ICON_MON ; Perrserker
nybble ICON_FAIRY ; Pikachu
nybble ICON_FAIRY ; Raichu
nybble ICON_FAIRY ; Gorochu
nybble ICON_BIRD ; Spearow
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
nybble ICON_MON ; Sandshrew
nybble ICON_MON ; Sandslash
; nybble ICON_MON ; Sandslash-A
nybble ICON_MON ; NidoranF
nybble ICON_MON ; Nidorina
nybble ICON_MON ; Nidoqueen
@ -47,6 +59,7 @@ MonPartyData:
nybble ICON_MON ; Geodude
nybble ICON_MON ; Graveler
nybble ICON_MON ; Golem
; nybble ICON_MON ; Golem-A
nybble ICON_BUG ; Para
nybble ICON_BUG ; Paras
nybble ICON_BUG ; Parasect
@ -57,9 +70,11 @@ MonPartyData:
nybble ICON_QUADRUPED ; Mikon
nybble ICON_QUADRUPED ; Vulpix
nybble ICON_QUADRUPED ; Ninetales
; nybble ICON_QUADRUPED ; Ninetales-A
nybble ICON_QUADRUPED ; Pudi
nybble ICON_QUADRUPED ; Growlithe
nybble ICON_QUADRUPED ; Arcanine
; nybble ICON_QUADRUPED ; Arcanine-A
nybble ICON_MON ; Mankey
nybble ICON_MON ; Primeape
nybble ICON_MON ; Annihilape
@ -90,8 +105,15 @@ MonPartyData:
nybble ICON_MON ; Poliwhirl
nybble ICON_MON ; Poliwrath
nybble ICON_MON ; Politoed
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_SNAKE ; Onix
nybble ICON_SNAKE ; Steelix
nybble ICON_MON ; Diglett
nybble ICON_MON ; Dugtrio
; nybble ICON_MON ; Dugtrio-A
nybble ICON_WATER ; Wiglett
nybble ICON_WATER ; Wugtrio
nybble ICON_MON ; Drowzee
@ -101,16 +123,11 @@ MonPartyData:
nybble ICON_QUADRUPED ; Gorotora
nybble ICON_BALL ; Voltorb
nybble ICON_BALL ; Electrode
; nybble ICON_BALL ; Electrode-A
nybble ICON_WATER ; Tentacool
nybble ICON_WATER ; Tentacruel
nybble ICON_GRASS ; Toedscool
nybble ICON_GRASS ; Toedscruel
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_SNAKE ; Onix
nybble ICON_SNAKE ; Steelix
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton
@ -126,10 +143,13 @@ MonPartyData:
nybble ICON_WATER ; Kingler
nybble ICON_QUADRUPED ; Slowpoke
nybble ICON_MON ; Slowbro
; nybble ICON_MON ; Slowbro-G
nybble ICON_MON ; Slowking
; nybble ICON_MON ; Slowking-G
nybble ICON_QUADRUPED ; Puchikoon
nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash
; nybble ICON_QUADRUPED ; Rapidash-G
nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth
@ -142,12 +162,15 @@ MonPartyData:
nybble ICON_MON ; Gengar
nybble ICON_MON ; Cubone
nybble ICON_MON ; Marowak
; nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_MON ; Betobebii
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
; nybble ICON_MON ; Muk-A
nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing
; nybble ICON_MON ; Weezing-G
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_MON ; Ditto
@ -171,6 +194,7 @@ MonPartyData:
nybble ICON_WATER ; Jagg
nybble ICON_GRASS ; Exeggcute
nybble ICON_GRASS ; Exeggutor
; nybble ICON_GRASS ; Exeggutor-A
nybble ICON_QUADRUPED ; Rhyhorn
nybble ICON_MON ; Rhydon
nybble ICON_MON ; Rhyperior
@ -182,12 +206,16 @@ MonPartyData:
nybble ICON_MON ; Kangaskhan
nybble ICON_MON ; Trampel
nybble ICON_QUADRUPED ; Tauros
; nybble ICON_QUADRUPED ; Tauros-P
; nybble ICON_QUADRUPED ; Tauros-PA
; nybble ICON_QUADRUPED ; Tauros-PB
nybble ICON_FAIRY ; Chansey
nybble ICON_FAIRY ; Blissey
nybble ICON_MON ; Skimper
nybble ICON_MON ; Bawligua
nybble ICON_MON ; Cryithan
nybble ICON_MON ; Mr.Mime
; nybble ICON_MON ; Mr.Mime-G
nybble ICON_MON ; Mr.Rime
nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu
@ -196,15 +224,6 @@ MonPartyData:
nybble ICON_MON ; Magmar
nybble ICON_MON ; Magmortar
nybble ICON_WATER ; Lapras
nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon
nybble ICON_QUADRUPED ; Flareon
nybble ICON_QUADRUPED ; Espeon
nybble ICON_QUADRUPED ; Umbreon
nybble ICON_QUADRUPED ; Leafeon
nybble ICON_QUADRUPED ; Glaceon
nybble ICON_QUADRUPED ; Sylveon
nybble ICON_BALL ; Porygon
nybble ICON_BALL ; Porygon2
nybble ICON_BALL ; Porygon-Z

82
data/pokemon/new_dex_text.asm
View file

@ -198,14 +198,14 @@ _PuchikoonDexEntry::
next "is very hot"
dex
_GyopinDexEntry:: ; may rework, I just reused PokeThon's version
text "It was once scarce"
next "and rarely seen,"
next "but thanks to a"
_GyopinDexEntry:: ; reworked, thank you Ness :3 ~M
text "Its tiny fins make"
next "it an unskilled"
next "swimmer. It fends"
page "dedicated breeder,"
next "it has since"
next "flourished"
page "off bigger #MON"
next "by attacking"
next "with its horn"
dex
_GorochuDexEntry::
@ -739,12 +739,12 @@ _MeltanDexEntry::
dex
_MelmetalDexEntry::
text "A #MON revered"
next "as a deity over"
text "A myth from over"
next "3,000 years ago"
next "depicted it as a"
page "for its ability"
next "to create pure"
page "giant with the"
next "ability to create"
next "iron from nothing"
dex
@ -808,26 +808,6 @@ _MoltresGDexEntry::
next "wanders too close"
dex
;_MeltanDexEntry::
; text "It feeds on metal."
; next "The strongest one"
; next "in a group will"
; page "absorb the rest"
; next "to evolve into"
; next "a MELMETAL"
; dex
;_MelmetalDexEntry::
; text "This #MON came"
; next "back to life"
; next "after 3,000"
; page "years. Myths"
; next "describe it"
; next "becoming a giant"
; dex ; consider revising - include longevity and it becoming a cyclopian giant
;_ArcanineHDexEntry::
; text "Its body has a"
; next "rock-like feel."
@ -869,12 +849,12 @@ _MoltresGDexEntry::
; dex
;_NinetalesADexEntry::
; text "It was once said"
; next "to be a deity."
; next "Disliking human" ; may not quite be accurate - interpretation of ultra sun entry. consider revising.
; text "Once thought to"
; next "be a deity, it"
; next "appears to lost"
; page "presence, it"
; next "guides them away"
; page "mountain climbers"
; next "to guide them away"
; next "from its home"
; dex
@ -935,7 +915,7 @@ _MoltresGDexEntry::
; page "Mumbling eerie"
; next "spells, it makes"
; next "strange POTIONS"
; next "strange POTIONs"
; dex
;_MukADexEntry::
@ -949,13 +929,13 @@ _MoltresGDexEntry::
; dex
;_ExeggutorADexEntry::
; text "While strong"
; next "sunlight has"
; next "allowed EXEGGUTOR"
; text "Strong sunlight"
; next "awoke its hidden"
; next "draconic powers."
; page "to attain its true"
; next "form, its PSI"
; next "power has faded"
; page "However, as a"
; next "result, its PSI"
; next "has weakened"
; dex ; consider revising
;_MarowakADexEntry::
@ -979,13 +959,13 @@ _MoltresGDexEntry::
; dex
;_MrMimeGDexEntry::
; text "Instead of using"
; next "PSI energy to"
; next "make invisible,"
; text "Although it no"
; next "longer creates"
; next "invisible walls,"
; page "walls, this MR."
; next "MIME makes them"
; next "using ice."
; page "This MR.MIME can"
; next "use PSI to make"
; next "barriers of ice"
; dex
;_TaurosPDexEntry::
@ -995,7 +975,7 @@ _MoltresGDexEntry::
; page "its thick muscles"
; next "to overwhelm its"
; next "opponents."
; next "opponents"
; dex
;_TaurosPBDexEntry::
@ -1015,7 +995,7 @@ _MoltresGDexEntry::
; page "shoot water at"
; next "high pressure from"
; next "its horns."
; next "its horns"
; dex
_MissingNoDexEntry::

55
data/pokemon/palettes.asm
View file

@ -10,8 +10,22 @@ MonsterPalettes:
db PAL_CYANMON ; SQUIRTLE
db PAL_CYANMON ; WARTORTLE
db PAL_CYANMON ; TOTARTLE
db PAL_YELLOWMON ; PIKACHU
db PAL_YELLOWMON ; RAICHU
; db PAL_YELLOWMON ; RAICHU_A
db PAL_YELLOWMON ; GOROCHU
db PAL_BROWNMON ; EEVEE
db PAL_CYANMON ; VAPOREON
db PAL_YELLOWMON ; JOLTEON
db PAL_REDMON ; FLAREON
db PAL_YELLOWMON ; ESPEON
db PAL_PURPLEMON ; UMBREON
db PAL_GREENMON ; LEAFEON
db PAL_CYANMON ; GLACEON
db PAL_MEWMON ; SYLVEON
db PAL_PURPLEMON ; RATTATA
db PAL_BROWNMON ; RATICATE
; db PAL_GREYMON ; RATICATE_A
db PAL_BROWNMON ; PIDGEY
db PAL_BROWNMON ; PIDGEOTTO
db PAL_BROWNMON ; PIDGEOT
@ -25,15 +39,13 @@ MonsterPalettes:
db PAL_YELLOWMON ; MEOWTH
db PAL_YELLOWMON ; PERSIAN
db PAL_GREYMON ; PERRSEKRER
db PAL_YELLOWMON ; PIKACHU
db PAL_YELLOWMON ; RAICHU
db PAL_YELLOWMON ; GOROCHU
db PAL_BROWNMON ; SPEAROW
db PAL_BROWNMON ; FEAROW
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
db PAL_BROWNMON ; SANDSHREW
db PAL_BROWNMON ; SANDSLASH
; db PAL_CYANMON ; SANDSLASH_A
db PAL_BLUEMON ; NIDORAN_F
db PAL_BLUEMON ; NIDORINA
db PAL_BLUEMON ; NIDOQUEEN
@ -48,6 +60,7 @@ MonsterPalettes:
db PAL_GREYMON ; GEODUDE
db PAL_GREYMON ; GRAVELER
db PAL_GREYMON ; GOLEM
; db PAL_GREYMON ; GOLEM_A
db PAL_REDMON ; PARA
db PAL_REDMON ; PARAS
db PAL_REDMON ; PARASECT
@ -58,9 +71,11 @@ MonsterPalettes:
db PAL_REDMON ; MIKON
db PAL_REDMON ; VULPIX
db PAL_YELLOWMON ; NINETALES
; db PAL_CYANMON ; NINETALES_A
db PAL_REDMON ; PUDI
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
; db PAL_REDMON ; ARCANINE_A
db PAL_BROWNMON ; MANKEY
db PAL_BROWNMON ; PRIMEAPE
db PAL_GREYMON ; ANNIHILAPE
@ -91,8 +106,15 @@ MonsterPalettes:
db PAL_BLUEMON ; POLIWHIRL
db PAL_BLUEMON ; POLIWRATH
db PAL_GREENMON ; POLITOED
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_GREYMON ; ONIX
db PAL_GREYMON ; STEELIX
db PAL_BROWNMON ; DIGLETT
db PAL_BROWNMON ; DUGTRIO
; db PAL_BROWNMON ; DUGTRIO_A
db PAL_PINKMON ; WIGLETT
db PAL_PINKMON ; WUGTRIO
db PAL_YELLOWMON ; DROWZEE
@ -102,16 +124,11 @@ MonsterPalettes:
db PAL_YELLOWMON ; GOROTORA
db PAL_REDMON ; VOLTORB
db PAL_REDMON ; ELECTRODE
; db PAL_REDMON ; ELECTRODE_H
db PAL_CYANMON ; TENTACOOL
db PAL_CYANMON ; TENTACRUEL
db PAL_BROWNMON ; TOEDSCOOL
db PAL_YELLOWMON ; TOEDSCRUEL - Yellow doesn't really look right...
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_GREYMON ; ONIX
db PAL_GREYMON ; STEELIX
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
@ -127,10 +144,13 @@ MonsterPalettes:
db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE
db PAL_PINKMON ; SLOWBRO
; db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PINKMON ; SLOWKING
; db PAL_PURPLEMON ; SLOWKING_G
db PAL_REDMON ; PUCHIKOON
db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH
; db PAL_PURPLEMON ; RAPIDASH_G
db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH
@ -143,12 +163,15 @@ MonsterPalettes:
db PAL_PURPLEMON ; GENGAR
db PAL_BROWNMON ; CUBONE
db PAL_BROWNMON ; MAROWAK
; db PAL_PURPLEMON ; MAROWAK_A
db PAL_BROWNMON ; GUARDIA
db PAL_PURPLEMON ; BETOBEBII
db PAL_PURPLEMON ; GRIMER
db PAL_PURPLEMON ; MUK
; db PAL_GREENMON ; MUK_A
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
; db PAL_GREYMON ; WEEZING_G
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_PURPLEMON ; DITTO
@ -172,6 +195,7 @@ MonsterPalettes:
db PAL_BLUEMON ; JAGG
db PAL_PINKMON ; EXEGGCUTE
db PAL_GREENMON ; EXEGGUTOR
; db PAL_GREENMON ; EXEGGUTOR_A
db PAL_GREYMON ; RHYHORN
db PAL_GREYMON ; RHYDON
db PAL_BROWNMON ; RHYPERIOR
@ -183,12 +207,16 @@ MonsterPalettes:
db PAL_BROWNMON ; KANGASKHAN
db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS
; db PAL_GREYMON ; TAUROS_P
; db PAL_BLUEMON ; TAUROS_PA
; db PAL_REDMON ; TAUROS_PB
db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY
db PAL_CYANMON ; SKIMPER
db PAL_CYANMON ; BAWLIGUA
db PAL_CYANMON ; CRYITHAN
db PAL_PINKMON ; MR_MIME
; db PAL_CYANMON ; MR_MIME_G
db PAL_CYANMON ; MR_RIME
db PAL_REDBAR ; JYNX
db PAL_BLUEMON ; BUU
@ -197,15 +225,6 @@ MonsterPalettes:
db PAL_REDMON ; MAGMAR
db PAL_REDMON ; MAGMORTAR
db PAL_CYANMON ; LAPRAS
db PAL_BROWNMON ; EEVEE
db PAL_CYANMON ; VAPOREON
db PAL_YELLOWMON ; JOLTEON
db PAL_REDMON ; FLAREON
db PAL_YELLOWMON ; ESPEON
db PAL_PURPLEMON ; UMBREON
db PAL_GREENMON ; LEAFEON
db PAL_CYANMON ; GLACEON
db PAL_MEWMON ; SYLVEON
db PAL_MEWMON ; PORYGON
db PAL_MEWMON ; PORYGON2
db PAL_MEWMON ; PORYGONZ