diff options
Diffstat (limited to 'data/pokemon')
158 files changed, 2479 insertions, 2524 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 809ae8eb..b4360286 100755 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -151,3 +151,4 @@ INCLUDE "data/pokemon/base_stats/dratini.asm" INCLUDE "data/pokemon/base_stats/dragonair.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm" +INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 3c69c7c7..54c9a9c9 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -7,17 +7,17 @@ db 200 ; catch rate db 73 ; base exp - INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/abra.pic", 0, 1 ; sprite dimensions dw AbraPicFront, AbraPicBack db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index aad1aff5..5ed73b3e 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 202 ; base exp - INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic", 0, 1 ; sprite dimensions dw AerodactylPicFront, AerodactylPicBack db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ HYPER_BEAM, RAGE, DRAGON_RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 0064416f..c3e1c4cd 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -7,18 +7,18 @@ db 50 ; catch rate db 186 ; base exp - INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/alakazam.pic", 0, 1 ; sprite dimensions dw AlakazamPicFront, AlakazamPicBack - db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index c34316ce..f981efae 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 147 ; base exp - INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/arbok.pic", 0, 1 ; sprite dimensions dw ArbokPicFront, ArbokPicBack db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index d21ec31b..380be0a8 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 213 ; base exp - INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/arcanine.pic", 0, 1 ; sprite dimensions dw ArcaninePicFront, ArcaninePicBack db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index c40d5326..d53fc4fc 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 215 ; base exp - INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/articuno.pic", 0, 1 ; sprite dimensions dw ArticunoPicFront, ArticunoPicBack db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 328538a3..ac1c5757 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 159 ; base exp - INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/beedrill.pic", 0, 1 ; sprite dimensions dw BeedrillPicFront, BeedrillPicBack db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 075598db..8b46be24 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 84 ; base exp - INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/bellsprout.pic", 0, 1 ; sprite dimensions dw BellsproutPicFront, BellsproutPicBack db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 512c66a3..041db750 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 210 ; base exp - INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/blastoise.pic", 0, 1 ; sprite dimensions dw BlastoisePicFront, BlastoisePicBack db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index e2796f9e..a20d2744 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions dw BulbasaurPicFront, BulbasaurPicBack db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index f18cf5e9..ca480b58 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 160 ; base exp - INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, REST, PSYWAVE, SUBSTITUTE + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index e9c196ab..1f048547 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 53 ; base exp - INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/caterpie.pic", 0, 1 ; sprite dimensions dw CaterpiePicFront, CaterpiePicBack db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index fc1fcb71..81da1513 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -7,20 +7,20 @@ db 30 ; catch rate db 255 ; base exp - INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/chansey.pic", 0, 1 ; sprite dimensions dw ChanseyPicFront, ChanseyPicBack - db POUND, DOUBLESLAP, NO_MOVE, NO_MOVE ; level 1 learnset + db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 715e0f7f..7154f472 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 209 ; base exp - INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charizard.pic", 0, 1 ; sprite dimensions dw CharizardPicFront, CharizardPicBack db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ - CUT, STRENGTH + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + CUT, FLY, STRENGTH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index acf364ed..4e3a7f59 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 65 ; base exp - INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charmander.pic", 0, 1 ; sprite dimensions dw CharmanderPicFront, CharmanderPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 0305197e..e85ef0de 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 142 ; base exp - INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/charmeleon.pic", 0, 1 ; sprite dimensions dw CharmeleonPicFront, CharmeleonPicBack db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 0aef8405..c01ac2e6 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -7,19 +7,19 @@ db 25 ; catch rate db 129 ; base exp - INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/clefable.pic", 0, 1 ; sprite dimensions dw ClefablePicFront, ClefablePicBack db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 136b30be..a00ccafe 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -7,19 +7,19 @@ db 150 ; catch rate db 68 ; base exp - INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/clefairy.pic", 0, 1 ; sprite dimensions dw ClefairyPicFront, ClefairyPicBack db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 8b75cb0e..eb691a50 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -7,17 +7,17 @@ db 60 ; catch rate db 203 ; base exp - INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/cloyster.pic", 0, 1 ; sprite dimensions dw CloysterPicFront, CloysterPicBack db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ - SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ + SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 6a813ab6..53224fb8 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 87 ; base exp - INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/cubone.pic", 0, 1 ; sprite dimensions dw CubonePicFront, CubonePicBack - db BONE_CLUB, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 822189a9..7bb63662 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 176 ; base exp - INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dewgong.pic", 0, 1 ; sprite dimensions dw DewgongPicFront, DewgongPicBack db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index c8ee014b..76721d69 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 81 ; base exp - INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/diglett.pic", 0, 1 ; sprite dimensions dw DiglettPicFront, DiglettPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, REST, ROCK_SLIDE, SUBSTITUTE + BIDE, REST, ROCK_SLIDE, SUBSTITUTE, CUT ; end db 0 ; padding diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index a3d919f4..a8a175ec 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -7,7 +7,7 @@ db 35 ; catch rate db 61 ; base exp - INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ditto.pic", 0, 1 ; sprite dimensions dw DittoPicFront, DittoPicBack db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index a3e95545..481c021b 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 158 ; base exp - INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dodrio.pic", 0, 1 ; sprite dimensions dw DodrioPicFront, DodrioPicBack db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 9803960b..af9e2cf7 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 96 ; base exp - INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/doduo.pic", 0, 1 ; sprite dimensions dw DoduoPicFront, DoduoPicBack db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 1178ebcc..c50c8e74 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -4,10 +4,10 @@ ; hp atk def spd spc db DRAGON, DRAGON ; type - db 45 ; catch rate + db 27 ; catch rate db 144 ; base exp - INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions dw DragonairPicFront, DragonairPicBack db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index 968d53b6..ff4aa45a 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -4,21 +4,21 @@ ; hp atk def spd spc db DRAGON, FLYING ; type - db 45 ; catch rate + db 9 ; catch rate db 218 ; base exp - INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dragonite.pic", 0, 1 ; sprite dimensions dw DragonitePicFront, DragonitePicBack db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ + tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 42a93822..28ac755b 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 67 ; base exp - INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dratini.pic", 0, 1 ; sprite dimensions dw DratiniPicFront, DratiniPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, DRAGON_RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 047b9f8e..0c71b320 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 102 ; base exp - INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/drowzee.pic", 0, 1 ; sprite dimensions dw DrowzeePicFront, DrowzeePicBack db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index cffc8750..e29c120b 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -7,16 +7,17 @@ db 50 ; catch rate db 153 ; base exp - INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/dugtrio.pic", 0, 1 ; sprite dimensions dw DugtrioPicFront, DugtrioPicBack db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE, \ + CUT ; end db 0 ; padding diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index a3a6ed4c..add50a6d 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 92 ; base exp - INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/eevee.pic", 0, 1 ; sprite dimensions dw EeveePicFront, EeveePicBack - db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 878d223f..0b6a8945 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 62 ; base exp - INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ekans.pic", 0, 1 ; sprite dimensions dw EkansPicFront, EkansPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 8378cc52..dfd153bb 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 156 ; base exp - INCBIN "gfx/pokemon/front/electabuzz.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/electabuzz.pic", 0, 1 ; sprite dimensions dw ElectabuzzPicFront, ElectabuzzPicBack db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 59f21767..ae2e6cf4 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 150 ; base exp - INCBIN "gfx/pokemon/front/electrode.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/electrode.pic", 0, 1 ; sprite dimensions dw ElectrodePicFront, ElectrodePicBack db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, EXPLOSION, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 8eea9e3a..418c3948 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 98 ; base exp - INCBIN "gfx/pokemon/front/exeggcute.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/exeggcute.pic", 0, 1 ; sprite dimensions dw ExeggcutePicFront, ExeggcutePicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index cb4d3ee6..236d706e 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 212 ; base exp - INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/exeggutor.pic", 0, 1 ; sprite dimensions dw ExeggutorPicFront, ExeggutorPicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm index 8e0d79e4..d608b3fb 100644 --- a/data/pokemon/base_stats/farfetchd.asm +++ b/data/pokemon/base_stats/farfetchd.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 94 ; base exp - INCBIN "gfx/pokemon/front/farfetchd.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/farfetchd.pic", 0, 1 ; sprite dimensions dw FarfetchdPicFront, FarfetchdPicBack db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ + tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ TAKE_DOWN, DOUBLE_EDGE, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 33ad5c5a..afb89921 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 162 ; base exp - INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/fearow.pic", 0, 1 ; sprite dimensions dw FearowPicFront, FearowPicBack db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 5ccf33ef..0a714783 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 198 ; base exp - INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/flareon.pic", 0, 1 ; sprite dimensions dw FlareonPicFront, FlareonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, EMBER ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, EMBER ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index f48b4234..fc8c86ef 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 95 ; base exp - INCBIN "gfx/pokemon/front/gastly.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gastly.pic", 0, 1 ; sprite dimensions dw GastlyPicFront, GastlyPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 3a07a441..dc9105c6 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 190 ; base exp - INCBIN "gfx/pokemon/front/gengar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gengar.pic", 0, 1 ; sprite dimensions dw GengarPicFront, GengarPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ - SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ + SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 849e1234..a2225f5c 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 86 ; base exp - INCBIN "gfx/pokemon/front/geodude.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/geodude.pic", 0, 1 ; sprite dimensions dw GeodudePicFront, GeodudePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 7526d5ef..8c24985c 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 132 ; base exp - INCBIN "gfx/pokemon/front/gloom.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gloom.pic", 0, 1 ; sprite dimensions dw GloomPicFront, GloomPicBack db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 9c852c91..6eb60490 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 171 ; base exp - INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golbat.pic", 0, 1 ; sprite dimensions dw GolbatPicFront, GolbatPicBack db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 35ea2418..662c6c93 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 111 ; base exp - INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/goldeen.pic", 0, 1 ; sprite dimensions dw GoldeenPicFront, GoldeenPicBack db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index eb79d100..b7c035c6 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 174 ; base exp - INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index adcefb3f..a8f5cbf9 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 177 ; base exp - INCBIN "gfx/pokemon/front/golem.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/golem.pic", 0, 1 ; sprite dimensions dw GolemPicFront, GolemPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index af0b3dcc..d5dfda81 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 134 ; base exp - INCBIN "gfx/pokemon/front/graveler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/graveler.pic", 0, 1 ; sprite dimensions dw GravelerPicFront, GravelerPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index 24e972ce..b2e0f08a 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 90 ; base exp - INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions dw GrimerPicFront, GrimerPicBack db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index efc1059f..2c70184f 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 91 ; base exp - INCBIN "gfx/pokemon/front/growlithe.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/growlithe.pic", 0, 1 ; sprite dimensions dw GrowlithePicFront, GrowlithePicBack db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index f08d29c9..13c30ff8 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 214 ; base exp - INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/gyarados.pic", 0, 1 ; sprite dimensions dw GyaradosPicFront, GyaradosPicBack - db BITE, DRAGON_RAGE, LEER, HYDRO_PUMP ; level 1 learnset + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 71e94347..cf9df9ec 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 126 ; base exp - INCBIN "gfx/pokemon/front/haunter.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/haunter.pic", 0, 1 ; sprite dimensions dw HaunterPicFront, HaunterPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 407e5e32..1b7651ff 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 140 ; base exp - INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic", 0, 1 ; sprite dimensions dw HitmonchanPicFront, HitmonchanPicBack db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index e39ceecd..51da5f75 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 139 ; base exp - INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic", 0, 1 ; sprite dimensions dw HitmonleePicFront, HitmonleePicBack db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 9520ad59..1a5a5aff 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 83 ; base exp - INCBIN "gfx/pokemon/front/horsea.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/horsea.pic", 0, 1 ; sprite dimensions dw HorseaPicFront, HorseaPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, RAGE, MIMIC, DOUBLE_TEAM, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 760276db..b43cd961 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 165 ; base exp - INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/hypno.pic", 0, 1 ; sprite dimensions dw HypnoPicFront, HypnoPicBack db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 3601a924..3d69a8d7 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 141 ; base exp - INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ivysaur.pic", 0, 1 ; sprite dimensions dw IvysaurPicFront, IvysaurPicBack db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index c249d93d..8348431d 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -7,19 +7,19 @@ db 170 ; catch rate db 76 ; base exp - INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic", 0, 1 ; sprite dimensions dw JigglypuffPicFront, JigglypuffPicBack db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index cb7e989e..3db8c96a 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 197 ; base exp - INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jolteon.pic", 0, 1 ; sprite dimensions dw JolteonPicFront, JolteonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 1700c890..f4fe28c7 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 137 ; base exp - INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/jynx.pic", 0, 1 ; sprite dimensions dw JynxPicFront, JynxPicBack db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 407c78f5..d5d96d1f 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 119 ; base exp - INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kabuto.pic", 0, 1 ; sprite dimensions dw KabutoPicFront, KabutoPicBack db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 62585d70..f067949e 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 201 ; base exp - INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kabutops.pic", 0, 1 ; sprite dimensions dw KabutopsPicFront, KabutopsPicBack db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ - REST, SUBSTITUTE, SURF + tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, SURF ; end db 0 ; padding diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 51fc6a91..30d2feef 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -7,17 +7,17 @@ db 100 ; catch rate db 145 ; base exp - INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kadabra.pic", 0, 1 ; sprite dimensions dw KadabraPicFront, KadabraPicBack - db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ DIG, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index c0cfb63c..39870dc4 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 71 ; base exp - INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kakuna.pic", 0, 1 ; sprite dimensions dw KakunaPicFront, KakunaPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index ccd36041..7d3cf971 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 175 ; base exp - INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions dw KangaskhanPicFront, KangaskhanPicBack db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ - DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ + DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index d3b3b80e..c0d75d62 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 206 ; base exp - INCBIN "gfx/pokemon/front/kingler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/kingler.pic", 0, 1 ; sprite dimensions dw KinglerPicFront, KinglerPicBack db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index b9b63812..5b63ebc8 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 114 ; base exp - INCBIN "gfx/pokemon/front/koffing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/koffing.pic", 0, 1 ; sprite dimensions dw KoffingPicFront, KoffingPicBack db TACKLE, SMOG, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ + tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index 6bd1c197..dd0f739a 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -7,7 +7,7 @@ db 225 ; catch rate db 115 ; base exp - INCBIN "gfx/pokemon/front/krabby.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/krabby.pic", 0, 1 ; sprite dimensions dw KrabbyPicFront, KrabbyPicBack db BUBBLE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 5e31f7f5..eb45e08c 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 219 ; base exp - INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/lapras.pic", 0, 1 ; sprite dimensions dw LaprasPicFront, LaprasPicBack db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 45826b40..eef13946 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 127 ; base exp - INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/lickitung.pic", 0, 1 ; sprite dimensions dw LickitungPicFront, LickitungPicBack db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index f750f9fa..e00ccea6 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 193 ; base exp - INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machamp.pic", 0, 1 ; sprite dimensions dw MachampPicFront, MachampPicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index b52772ef..0e1a1d46 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -7,17 +7,17 @@ db 90 ; catch rate db 146 ; base exp - INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machoke.pic", 0, 1 ; sprite dimensions dw MachokePicFront, MachokePicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 20fe0e6e..3c7b8491 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -7,17 +7,17 @@ db 180 ; catch rate db 88 ; base exp - INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/machop.pic", 0, 1 ; sprite dimensions dw MachopPicFront, MachopPicBack db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index c2c2f8c2..8d7eef46 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 20 ; base exp - INCBIN "gfx/pokemon/front/magikarp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magikarp.pic", 0, 1 ; sprite dimensions dw MagikarpPicFront, MagikarpPicBack db SPLASH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index b402cfa3..1619e211 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 167 ; base exp - INCBIN "gfx/pokemon/front/magmar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magmar.pic", 0, 1 ; sprite dimensions dw MagmarPicFront, MagmarPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 6242d692..cb249496 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 89 ; base exp - INCBIN "gfx/pokemon/front/magnemite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magnemite.pic", 0, 1 ; sprite dimensions dw MagnemitePicFront, MagnemitePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 13d2e595..36db2428 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 161 ; base exp - INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/magneton.pic", 0, 1 ; sprite dimensions dw MagnetonPicFront, MagnetonPicBack db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ + REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index ea529243..cb60435b 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 74 ; base exp - INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mankey.pic", 0, 1 ; sprite dimensions dw MankeyPicFront, MankeyPicBack db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index 3d22e68a..bdd1636e 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 124 ; base exp - INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/marowak.pic", 0, 1 ; sprite dimensions dw MarowakPicFront, MarowakPicBack - db BONE_CLUB, GROWL, LEER, FOCUS_ENERGY ; level 1 learnset + db BONE_CLUB, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 31a59bd5..9b06043b 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 69 ; base exp - INCBIN "gfx/pokemon/front/meowth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/meowth.pic", 0, 1 ; sprite dimensions dw MeowthPicFront, MeowthPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index e20b08bf..5d3d1740 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 72 ; base exp - INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/metapod.pic", 0, 1 ; sprite dimensions dw MetapodPicFront, MetapodPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 82a7ec47..caa7fb85 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -7,25 +7,24 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front/mew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mew.pic", 0, 1 ; sprite dimensions dw MewPicFront, MewPicBack db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ - SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ - PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ - CUT, FLY, SURF, STRENGTH, FLASH, \ - UNUSED + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ + SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ + CUT, FLY, SURF, STRENGTH, FLASH ; end - db %11111111 ; padding + db 0 ; padding diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 5b276291..99ff53fe 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -7,21 +7,20 @@ db 3 ; catch rate db 220 ; base exp - INCBIN "gfx/pokemon/front/mewtwo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mewtwo.pic", 0, 1 ; sprite dimensions dw MewtwoPicFront, MewtwoPicBack db CONFUSION, DISABLE, SWIFT, PSYCHIC_M ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ - FLASH + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 58745a29..50b23fd8 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 217 ; base exp - INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/moltres.pic", 0, 1 ; sprite dimensions dw MoltresPicFront, MoltresPicBack db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm index 20c96508..e6cdba21 100644 --- a/data/pokemon/base_stats/mrmime.asm +++ b/data/pokemon/base_stats/mrmime.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 136 ; base exp - INCBIN "gfx/pokemon/front/mr.mime.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/mr.mime.pic", 0, 1 ; sprite dimensions dw MrMimePicFront, MrMimePicBack db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 901421ec..42885050 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -7,15 +7,15 @@ db 75 ; catch rate db 157 ; base exp - INCBIN "gfx/pokemon/front/muk.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/muk.pic", 0, 1 ; sprite dimensions dw MukPicFront, MukPicBack db POUND, DISABLE, POISON_GAS, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 2e0d4177..602ed2ff 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 195 ; base exp - INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 9b249f98..5fba3fed 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 194 ; base exp - INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic", 0, 1 ; sprite dimensions dw NidoqueenPicFront, NidoqueenPicBack db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm index 8ba4316c..814e2dd7 100644 --- a/data/pokemon/base_stats/nidoranf.asm +++ b/data/pokemon/base_stats/nidoranf.asm @@ -7,14 +7,14 @@ db 235 ; catch rate db 59 ; base exp - INCBIN "gfx/pokemon/front/nidoranf.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoranf.pic", 0, 1 ; sprite dimensions dw NidoranFPicFront, NidoranFPicBack db GROWL, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm index 2b412640..05b3050a 100644 --- a/data/pokemon/base_stats/nidoranm.asm +++ b/data/pokemon/base_stats/nidoranm.asm @@ -7,7 +7,7 @@ db 235 ; catch rate db 60 ; base exp - INCBIN "gfx/pokemon/front/nidoranm.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidoranm.pic", 0, 1 ; sprite dimensions dw NidoranMPicFront, NidoranMPicBack db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 4345aeb7..9831db3e 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 117 ; base exp - INCBIN "gfx/pokemon/front/nidorina.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidorina.pic", 0, 1 ; sprite dimensions dw NidorinaPicFront, NidorinaPicBack db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 44a11559..d8abd036 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 118 ; base exp - INCBIN "gfx/pokemon/front/nidorino.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/nidorino.pic", 0, 1 ; sprite dimensions dw NidorinoPicFront, NidorinoPicBack db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 2c2bc615..7373d2e9 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 178 ; base exp - INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ninetales.pic", 0, 1 ; sprite dimensions dw NinetalesPicFront, NinetalesPicBack db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 60172ea4..de1498b9 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 78 ; base exp - INCBIN "gfx/pokemon/front/oddish.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/oddish.pic", 0, 1 ; sprite dimensions dw OddishPicFront, OddishPicBack db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 258b2706..1dff5d20 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 120 ; base exp - INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/omanyte.pic", 0, 1 ; sprite dimensions dw OmanytePicFront, OmanytePicBack db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 8ba4113e..1deaf789 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 199 ; base exp - INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/omastar.pic", 0, 1 ; sprite dimensions dw OmastarPicFront, OmastarPicBack db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 29d2f677..96048ee5 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 108 ; base exp - INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/onix.pic", 0, 1 ; sprite dimensions dw OnixPicFront, OnixPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ + BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 0a36e229..82e9920e 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 70 ; base exp - INCBIN "gfx/pokemon/front/paras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/paras.pic", 0, 1 ; sprite dimensions dw ParasPicFront, ParasPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index 5fa09fc9..bcd47673 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 128 ; base exp - INCBIN "gfx/pokemon/front/parasect.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/parasect.pic", 0, 1 ; sprite dimensions dw ParasectPicFront, ParasectPicBack db SCRATCH, STUN_SPORE, LEECH_LIFE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index ec214ead..4da05861 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 148 ; base exp - INCBIN "gfx/pokemon/front/persian.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/persian.pic", 0, 1 ; sprite dimensions dw PersianPicFront, PersianPicBack db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 9be82174..b4370201 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 172 ; base exp - INCBIN "gfx/pokemon/front/pidgeot.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgeot.pic", 0, 1 ; sprite dimensions dw PidgeotPicFront, PidgeotPicBack db GUST, SAND_ATTACK, QUICK_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 2b99e4a6..c44325db 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 113 ; base exp - INCBIN "gfx/pokemon/front/pidgeotto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic", 0, 1 ; sprite dimensions dw PidgeottoPicFront, PidgeottoPicBack db GUST, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 04d23804..0c1c241b 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 55 ; base exp - INCBIN "gfx/pokemon/front/pidgey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pidgey.pic", 0, 1 ; sprite dimensions dw PidgeyPicFront, PidgeyPicBack db GUST, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 4a7f5e80..8bef5f8b 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 82 ; base exp - INCBIN "gfx/pokemon/front/pikachu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pikachu.pic", 0, 1 ; sprite dimensions dw PikachuPicFront, PikachuPicBack db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 946feaf1..e67a2896 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 200 ; base exp - INCBIN "gfx/pokemon/front/pinsir.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/pinsir.pic", 0, 1 ; sprite dimensions dw PinsirPicFront, PinsirPicBack db VICEGRIP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index f13b4c85..04f0aae5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 77 ; base exp - INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwag.pic", 0, 1 ; sprite dimensions dw PoliwagPicFront, PoliwagPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index 8055d5ff..54673b74 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -7,18 +7,18 @@ db 120 ; catch rate db 131 ; base exp - INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic", 0, 1 ; sprite dimensions dw PoliwhirlPicFront, PoliwhirlPicBack db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index cd89c1ed..2c3b6bc5 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 185 ; base exp - INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/poliwrath.pic", 0, 1 ; sprite dimensions dw PoliwrathPicFront, PoliwrathPicBack db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 71d51956..ee8e3389 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 152 ; base exp - INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/ponyta.pic", 0, 1 ; sprite dimensions dw PonytaPicFront, PonytaPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index bfec59ef..8be8923e 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 130 ; base exp - INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/porygon.pic", 0, 1 ; sprite dimensions dw PorygonPicFront, PorygonPicBack db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 12f8bb01..57f6e901 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 149 ; base exp - INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/primeape.pic", 0, 1 ; sprite dimensions dw PrimeapePicFront, PrimeapePicBack - db SCRATCH, LEER, KARATE_CHOP, FURY_SWIPES ; level 1 learnset + db SCRATCH, LEER, LOW_KICK, KARATE_CHOP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index b3fb9f41..1f6c4437 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 80 ; base exp - INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/psyduck.pic", 0, 1 ; sprite dimensions dw PsyduckPicFront, PsyduckPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index a5c5acea..9ac93813 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 122 ; base exp - INCBIN "gfx/pokemon/front/raichu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/raichu.pic", 0, 1 ; sprite dimensions dw RaichuPicFront, RaichuPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index dbe16ab0..8a093859 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 192 ; base exp - INCBIN "gfx/pokemon/front/rapidash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rapidash.pic", 0, 1 ; sprite dimensions dw RapidashPicFront, RapidashPicBack db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index b33adf4d..9dc46afb 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 116 ; base exp - INCBIN "gfx/pokemon/front/raticate.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/raticate.pic", 0, 1 ; sprite dimensions dw RaticatePicFront, RaticatePicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \ BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index d6e263a1..9cace629 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 57 ; base exp - INCBIN "gfx/pokemon/front/rattata.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rattata.pic", 0, 1 ; sprite dimensions dw RattataPicFront, RattataPicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index c6b17500..f08f7255 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -7,19 +7,19 @@ db 60 ; catch rate db 204 ; base exp - INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rhydon.pic", 0, 1 ; sprite dimensions dw RhydonPicFront, RhydonPicBack db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index 6f4bb31b..3b8b1eb4 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 135 ; base exp - INCBIN "gfx/pokemon/front/rhyhorn.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic", 0, 1 ; sprite dimensions dw RhyhornPicFront, RhyhornPicBack db HORN_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index a05f516f..aa107190 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 93 ; base exp - INCBIN "gfx/pokemon/front/sandshrew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/sandshrew.pic", 0, 1 ; sprite dimensions dw SandshrewPicFront, SandshrewPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ - SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ + SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 5a50dd25..9c51bbba 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 163 ; base exp - INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/sandslash.pic", 0, 1 ; sprite dimensions dw SandslashPicFront, SandslashPicBack db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index 044a2baf..de73eea4 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 187 ; base exp - INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/scyther.pic", 0, 1 ; sprite dimensions dw ScytherPicFront, ScytherPicBack db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 6e3fb7ef..89ab670f 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 155 ; base exp - INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seadra.pic", 0, 1 ; sprite dimensions dw SeadraPicFront, SeadraPicBack db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 532a4c70..bcb0dd64 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 170 ; base exp - INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seaking.pic", 0, 1 ; sprite dimensions dw SeakingPicFront, SeakingPicBack db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index e2fe02ec..eba3d34d 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 100 ; base exp - INCBIN "gfx/pokemon/front/seel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/seel.pic", 0, 1 ; sprite dimensions dw SeelPicFront, SeelPicBack db HEADBUTT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index b52f7cb4..ed8cc154 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 97 ; base exp - INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/shellder.pic", 0, 1 ; sprite dimensions dw ShellderPicFront, ShellderPicBack db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index 77483e91..33f02f22 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -7,20 +7,20 @@ db 75 ; catch rate db 164 ; base exp - INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/slowbro.pic", 0, 1 ; sprite dimensions dw SlowbroPicFront, SlowbroPicBack db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ - PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 0ae2ef0a..32eb6aa9 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -7,18 +7,18 @@ db 190 ; catch rate db 99 ; base exp - INCBIN "gfx/pokemon/front/slowpoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/slowpoke.pic", 0, 1 ; sprite dimensions dw SlowpokePicFront, SlowpokePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9b6ccd3e..f835a4b9 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -7,20 +7,20 @@ db 25 ; catch rate db 154 ; base exp - INCBIN "gfx/pokemon/front/snorlax.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/snorlax.pic", 0, 1 ; sprite dimensions dw SnorlaxPicFront, SnorlaxPicBack db HEADBUTT, AMNESIA, REST, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ - REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ + REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index 161f4100..c353fc89 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 58 ; base exp - INCBIN "gfx/pokemon/front/spearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/spearow.pic", 0, 1 ; sprite dimensions dw SpearowPicFront, SpearowPicBack db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index e844ac6e..11db64ac 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 66 ; base exp - INCBIN "gfx/pokemon/front/squirtle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/squirtle.pic", 0, 1 ; sprite dimensions dw SquirtlePicFront, SquirtlePicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 1ec43ca8..6f9681a2 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -7,18 +7,18 @@ db 60 ; catch rate db 207 ; base exp - INCBIN "gfx/pokemon/front/starmie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/starmie.pic", 0, 1 ; sprite dimensions dw StarmiePicFront, StarmiePicBack db TACKLE, WATER_GUN, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ THUNDER, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ FLASH ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 198f552f..08b1250b 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -7,17 +7,17 @@ db 225 ; catch rate db 106 ; base exp - INCBIN "gfx/pokemon/front/staryu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/staryu.pic", 0, 1 ; sprite dimensions dw StaryuPicFront, StaryuPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index 5380a4a7..bb0bafd1 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 166 ; base exp - INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions dw TangelaPicFront, TangelaPicBack - db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 9aba3e22..311eecad 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 211 ; base exp - INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tauros.pic", 0, 1 ; sprite dimensions dw TaurosPicFront, TaurosPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -17,7 +17,7 @@ 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, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index e8296d61..7f128c3f 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 105 ; base exp - INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tentacool.pic", 0, 1 ; sprite dimensions dw TentacoolPicFront, TentacoolPicBack db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index ad8f773e..eeea2d0f 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 205 ; base exp - INCBIN "gfx/pokemon/front/tentacruel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/tentacruel.pic", 0, 1 ; sprite dimensions dw TentacruelPicFront, TentacruelPicBack db ACID, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index ec5c01d2..bc800fea 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vaporeon.pic", 0, 1 ; sprite dimensions dw VaporeonPicFront, VaporeonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, WATER_GUN ; level 1 learnset + db TACKLE, TAIL_WHIP, QUICK_ATTACK, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c01ee263..85c1de76 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 138 ; base exp - INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions dw VenomothPicFront, VenomothPicBack - db TACKLE, DISABLE, POISONPOWDER, LEECH_LIFE ; level 1 learnset + db TACKLE, DISABLE, SUPERSONIC, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, REST, PSYWAVE, SUBSTITUTE + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 9c9ff071..47590f61 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 75 ; base exp - INCBIN "gfx/pokemon/front/venonat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venonat.pic", 0, 1 ; sprite dimensions dw VenonatPicFront, VenonatPicBack db TACKLE, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ - SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, REST, PSYWAVE, SUBSTITUTE + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ + SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, PSYWAVE, SUBSTITUTE, FLASH ; end db 0 ; padding diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 414590d8..d97b9c64 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 208 ; base exp - INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/venusaur.pic", 0, 1 ; sprite dimensions dw VenusaurPicFront, VenusaurPicBack db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 5b958297..8fd9c2f9 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 191 ; base exp - INCBIN "gfx/pokemon/front/victreebel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/victreebel.pic", 0, 1 ; sprite dimensions dw VictreebelPicFront, VictreebelPicBack db SLEEP_POWDER, STUN_SPORE, ACID, RAZOR_LEAF ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 10ae05da..d6baddb9 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 184 ; base exp - INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vileplume.pic", 0, 1 ; sprite dimensions dw VileplumePicFront, VileplumePicBack db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 4ad65701..6234d3a4 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 103 ; base exp - INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/voltorb.pic", 0, 1 ; sprite dimensions dw VoltorbPicFront, VoltorbPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index c112b97d..7aba033e 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 63 ; base exp - INCBIN "gfx/pokemon/front/vulpix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/vulpix.pic", 0, 1 ; sprite dimensions dw VulpixPicFront, VulpixPicBack db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index d430bcdc..df4c7314 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 143 ; base exp - INCBIN "gfx/pokemon/front/wartortle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/wartortle.pic", 0, 1 ; sprite dimensions dw WartortlePicFront, WartortlePicBack db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index f6aba236..67769f3b 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 52 ; base exp - INCBIN "gfx/pokemon/front/weedle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weedle.pic", 0, 1 ; sprite dimensions dw WeedlePicFront, WeedlePicBack db POISON_STING, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 513de8f8..90a3dc49 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 151 ; base exp - INCBIN "gfx/pokemon/front/weepinbell.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weepinbell.pic", 0, 1 ; sprite dimensions dw WeepinbellPicFront, WeepinbellPicBack db VINE_WHIP, GROWTH, WRAP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index d605f15a..f5618bb0 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -7,15 +7,15 @@ db 60 ; catch rate db 173 ; base exp - INCBIN "gfx/pokemon/front/weezing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/weezing.pic", 0, 1 ; sprite dimensions dw WeezingPicFront, WeezingPicBack db TACKLE, SMOG, SLUDGE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ + tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 7249badf..2a6876b2 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -7,19 +7,19 @@ db 50 ; catch rate db 109 ; base exp - INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic", 0, 1 ; sprite dimensions dw WigglytuffPicFront, WigglytuffPicBack db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 6571d286..68b6396a 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 216 ; base exp - INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/zapdos.pic", 0, 1 ; sprite dimensions dw ZapdosPicFront, ZapdosPicBack db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index ddae33cb..9e4fa80f 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 54 ; base exp - INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front_yellow/zubat.pic", 0, 1 ; sprite dimensions dw ZubatPicFront, ZubatPicBack db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, REST, SUBSTITUTE ; end diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 931793df..5b9acf27 100755 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -195,60 +195,11 @@ PokedexEntryPointers: ; weight in pounds ; text entry -RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 - text_far _RhydonDexEntry - text_end - -KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 - text_far _KangaskhanDexEntry - text_end - -NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 - text_far _NidoranMDexEntry - text_end - -ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 - text_far _ClefairyDexEntry - text_end - -SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _SpearowDexEntry - text_end - -VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 - text_far _VoltorbDexEntry - text_end - -NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 - text_far _NidokingDexEntry - text_end - -SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 - text_far _SlowbroDexEntry +BulbasaurDexEntry: + db "SEED@" + db 2,4 + dw 150 + text_far _BulbasaurDexEntry text_end IvysaurDexEntry: @@ -258,165 +209,137 @@ IvysaurDexEntry: text_far _IvysaurDexEntry text_end -ExeggutorDexEntry: - db "COCONUT@" +VenusaurDexEntry: + db "SEED@" db 6,7 - dw 2650 - text_far _ExeggutorDexEntry - text_end - -LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 - text_far _LickitungDexEntry - text_end - -ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 - text_far _ExeggcuteDexEntry - text_end - -GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 - text_far _GrimerDexEntry + dw 2210 + text_far _VenusaurDexEntry text_end -GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 - text_far _GengarDexEntry +CharmanderDexEntry: + db "LIZARD@" + db 2,0 + dw 190 + text_far _CharmanderDexEntry text_end -NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 - text_far _NidoranFDexEntry +CharmeleonDexEntry: + db "FLAME@" + db 3,7 + dw 420 + text_far _CharmeleonDexEntry text_end -NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 - text_far _NidoqueenDexEntry +CharizardDexEntry: + db "FLAME@" + db 5,7 + dw 2000 + text_far _CharizardDexEntry text_end -CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 - text_far _CuboneDexEntry +SquirtleDexEntry: + db "TINYTURTLE@" + db 1,8 + dw 200 + text_far _SquirtleDexEntry text_end -RhyhornDexEntry: - db "SPIKES@" +WartortleDexEntry: + db "TURTLE@" db 3,3 - dw 2540 - text_far _RhyhornDexEntry + dw 500 + text_far _WartortleDexEntry text_end -LaprasDexEntry: - db "TRANSPORT@" - db 8,2 - dw 4850 - text_far _LaprasDexEntry +BlastoiseDexEntry: + db "SHELLFISH@" + db 5,3 + dw 1890 + text_far _BlastoiseDexEntry text_end -ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 - text_far _ArcanineDexEntry +CaterpieDexEntry: + db "WORM@" + db 1,0 + dw 60 + text_far _CaterpieDexEntry text_end -MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 - text_far _MewDexEntry +MetapodDexEntry: + db "COCOON@" + db 2,4 + dw 220 + text_far _MetapodDexEntry text_end -GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 - text_far _GyaradosDexEntry +ButterfreeDexEntry: + db "BUTTERFLY@" + db 3,7 + dw 710 + text_far _ButterfreeDexEntry text_end -ShellderDexEntry: - db "BIVALVE@" +WeedleDexEntry: + db "HAIRY BUG@" db 1,0 - dw 90 - text_far _ShellderDexEntry - text_end - -TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 - text_far _TentacoolDexEntry + dw 70 + text_far _WeedleDexEntry text_end -GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 - text_far _GastlyDexEntry +KakunaDexEntry: + db "COCOON@" + db 2,0 + dw 220 + text_far _KakunaDexEntry text_end -ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 - text_far _ScytherDexEntry +BeedrillDexEntry: + db "POISON BEE@" + db 3,3 + dw 650 + text_far _BeedrillDexEntry text_end -StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 - text_far _StaryuDexEntry +PidgeyDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _PidgeyDexEntry text_end -BlastoiseDexEntry: - db "SHELLFISH@" - db 5,3 - dw 1890 - text_far _BlastoiseDexEntry +PidgeottoDexEntry: + db "BIRD@" + db 3,7 + dw 660 + text_far _PidgeottoDexEntry text_end -PinsirDexEntry: - db "STAGBEETLE@" +PidgeotDexEntry: + db "BIRD@" db 4,11 - dw 1210 - text_far _PinsirDexEntry + dw 870 + text_far _PidgeotDexEntry text_end -TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 - text_far _TangelaDexEntry +RattataDexEntry: + db "RAT@" + db 1,0 + dw 80 + text_far _RattataDexEntry text_end -GrowlitheDexEntry: - db "PUPPY@" +RaticateDexEntry: + db "RAT@" db 2,4 - dw 420 - text_far _GrowlitheDexEntry + dw 410 + text_far _RaticateDexEntry text_end -OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 - text_far _OnixDexEntry +SpearowDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _SpearowDexEntry text_end FearowDexEntry: @@ -426,165 +349,179 @@ FearowDexEntry: text_far _FearowDexEntry text_end -PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - text_far _PidgeyDexEntry - text_end - -SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 - text_far _SlowpokeDexEntry +EkansDexEntry: + db "SNAKE@" + db 6,7 + dw 150 + text_far _EkansDexEntry text_end -KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 - text_far _KadabraDexEntry +ArbokDexEntry: + db "COBRA@" + db 11,6 + dw 1430 + text_far _ArbokDexEntry text_end -GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 - text_far _GravelerDexEntry +PikachuDexEntry: + db "MOUSE@" + db 1,4 + dw 130 + text_far _PikachuDexEntry text_end -ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 - text_far _ChanseyDexEntry +RaichuDexEntry: + db "MOUSE@" + db 2,7 + dw 660 + text_far _RaichuDexEntry text_end -MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 - text_far _MachokeDexEntry +SandshrewDexEntry: + db "MOUSE@" + db 2,0 + dw 260 + text_far _SandshrewDexEntry text_end -MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 - text_far _MrMimeDexEntry +SandslashDexEntry: + db "MOUSE@" + db 3,3 + dw 650 + text_far _SandslashDexEntry text_end -HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 - text_far _HitmonleeDexEntry +NidoranFDexEntry: + db "POISON PIN@" + db 1,4 + dw 150 + text_far _NidoranFDexEntry text_end -HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 - text_far _HitmonchanDexEntry +NidorinaDexEntry: + db "POISON PIN@" + db 2,7 + dw 440 + text_far _NidorinaDexEntry text_end -ArbokDexEntry: - db "COBRA@" - db 11,6 - dw 1430 - text_far _ArbokDexEntry +NidoqueenDexEntry: + db "DRILL@" + db 4,3 + dw 1320 + text_far _NidoqueenDexEntry text_end -ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 - text_far _ParasectDexEntry +NidoranMDexEntry: + db "POISON PIN@" + db 1,8 + dw 200 + text_far _NidoranMDexEntry text_end -PsyduckDexEntry: - db "DUCK@" - db 2,7 +NidorinoDexEntry: + db "POISON PIN@" + db 2,11 dw 430 - text_far _PsyduckDexEntry + text_far _NidorinoDexEntry text_end -DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 - text_far _DrowzeeDexEntry +NidokingDexEntry: + db "DRILL@" + db 4,7 + dw 1370 + text_far _NidokingDexEntry text_end -GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 - text_far _GolemDexEntry +ClefairyDexEntry: + db "FAIRY@" + db 2,0 + dw 170 + text_far _ClefairyDexEntry text_end -MagmarDexEntry: - db "SPITFIRE@" +ClefableDexEntry: + db "FAIRY@" db 4,3 - dw 980 - text_far _MagmarDexEntry + dw 880 + text_far _ClefableDexEntry text_end -ElectabuzzDexEntry: - db "ELECTRIC@" +VulpixDexEntry: + db "FOX@" + db 2,0 + dw 220 + text_far _VulpixDexEntry + text_end + +NinetalesDexEntry: + db "FOX@" db 3,7 - dw 660 - text_far _ElectabuzzDexEntry + dw 440 + text_far _NinetalesDexEntry text_end -MagnetonDexEntry: - db "MAGNET@" +JigglypuffDexEntry: + db "BALLOON@" + db 1,8 + dw 120 + text_far _JigglypuffDexEntry + text_end + +WigglytuffDexEntry: + db "BALLOON@" db 3,3 - dw 1320 - text_far _MagnetonDexEntry + dw 260 + text_far _WigglytuffDexEntry text_end -KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 - text_far _KoffingDexEntry +ZubatDexEntry: + db "BAT@" + db 2,7 + dw 170 + text_far _ZubatDexEntry text_end -MankeyDexEntry: - db "PIG MONKEY@" +GolbatDexEntry: + db "BAT@" + db 5,3 + dw 1210 + text_far _GolbatDexEntry + text_end + +OddishDexEntry: + db "WEED@" db 1,8 - dw 620 - text_far _MankeyDexEntry + dw 120 + text_far _OddishDexEntry text_end -SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 - text_far _SeelDexEntry +GloomDexEntry: + db "WEED@" + db 2,7 + dw 190 + text_far _GloomDexEntry text_end -DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 - text_far _DiglettDexEntry +VileplumeDexEntry: + db "FLOWER@" + db 3,11 + dw 410 + text_far _VileplumeDexEntry text_end -TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 - text_far _TaurosDexEntry +ParasDexEntry: + db "MUSHROOM@" + db 1,0 + dw 120 + text_far _ParasDexEntry text_end -FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 - text_far _FarfetchdDexEntry +ParasectDexEntry: + db "MUSHROOM@" + db 3,3 + dw 650 + text_far _ParasectDexEntry text_end VenonatDexEntry: @@ -594,60 +531,25 @@ VenonatDexEntry: text_far _VenonatDexEntry text_end -DragoniteDexEntry: - db "DRAGON@" - db 7,3 - dw 4630 - text_far _DragoniteDexEntry - text_end - -DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 - text_far _DoduoDexEntry - text_end - -PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 - text_far _PoliwagDexEntry - text_end - -JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 - text_far _JynxDexEntry - text_end - -MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 - text_far _MoltresDexEntry - text_end - -ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 - text_far _ArticunoDexEntry +VenomothDexEntry: + db "POISONMOTH@" + db 4,11 + dw 280 + text_far _VenomothDexEntry text_end -ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 - text_far _ZapdosDexEntry +DiglettDexEntry: + db "MOLE@" + db 0,8 + dw 20 + text_far _DiglettDexEntry text_end -DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 - text_far _DittoDexEntry +DugtrioDexEntry: + db "MOLE@" + db 2,4 + dw 730 + text_far _DugtrioDexEntry text_end MeowthDexEntry: @@ -657,214 +559,228 @@ MeowthDexEntry: text_far _MeowthDexEntry text_end -KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 - text_far _KrabbyDexEntry +PersianDexEntry: + db "CLASSY CAT@" + db 3,3 + dw 710 + text_far _PersianDexEntry text_end -VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 - text_far _VulpixDexEntry +PsyduckDexEntry: + db "DUCK@" + db 2,7 + dw 430 + text_far _PsyduckDexEntry text_end -NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 - text_far _NinetalesDexEntry +GolduckDexEntry: + db "DUCK@" + db 5,7 + dw 1690 + text_far _GolduckDexEntry text_end -PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 - text_far _PikachuDexEntry +MankeyDexEntry: + db "PIG MONKEY@" + db 1,8 + dw 620 + text_far _MankeyDexEntry text_end -RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 - text_far _RaichuDexEntry +PrimeapeDexEntry: + db "PIG MONKEY@" + db 3,3 + dw 710 + text_far _PrimeapeDexEntry text_end -DratiniDexEntry: - db "DRAGON@" - db 5,11 - dw 70 - text_far _DratiniDexEntry +GrowlitheDexEntry: + db "PUPPY@" + db 2,4 + dw 420 + text_far _GrowlitheDexEntry text_end -DragonairDexEntry: - db "DRAGON@" - db 13,1 - dw 360 - text_far _DragonairDexEntry +ArcanineDexEntry: + db "LEGENDARY@" + db 6,3 + dw 3420 + text_far _ArcanineDexEntry text_end -KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 - text_far _KabutoDexEntry +PoliwagDexEntry: + db "TADPOLE@" + db 2,0 + dw 270 + text_far _PoliwagDexEntry text_end -KabutopsDexEntry: - db "SHELLFISH@" +PoliwhirlDexEntry: + db "TADPOLE@" + db 3,3 + dw 440 + text_far _PoliwhirlDexEntry + text_end + +PoliwrathDexEntry: + db "TADPOLE@" db 4,3 - dw 890 - text_far _KabutopsDexEntry + dw 1190 + text_far _PoliwrathDexEntry text_end -HorseaDexEntry: - db "DRAGON@" - db 1,4 - dw 180 - text_far _HorseaDexEntry +AbraDexEntry: + db "PSI@" + db 2,11 + dw 430 + text_far _AbraDexEntry text_end -SeadraDexEntry: - db "DRAGON@" - db 3,11 - dw 550 - text_far _SeadraDexEntry +KadabraDexEntry: + db "PSI@" + db 4,3 + dw 1250 + text_far _KadabraDexEntry text_end -SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 - text_far _SandshrewDexEntry +AlakazamDexEntry: + db "PSI@" + db 4,11 + dw 1060 + text_far _AlakazamDexEntry text_end -SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 - text_far _SandslashDexEntry +MachopDexEntry: + db "SUPERPOWER@" + db 2,7 + dw 430 + text_far _MachopDexEntry text_end -OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 - text_far _OmanyteDexEntry +MachokeDexEntry: + db "SUPERPOWER@" + db 4,11 + dw 1550 + text_far _MachokeDexEntry text_end -OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 - text_far _OmastarDexEntry +MachampDexEntry: + db "SUPERPOWER@" + db 5,3 + dw 2870 + text_far _MachampDexEntry text_end -JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 - text_far _JigglypuffDexEntry +BellsproutDexEntry: + db "FLOWER@" + db 2,4 + dw 90 + text_far _BellsproutDexEntry text_end -WigglytuffDexEntry: - db "BALLOON@" +WeepinbellDexEntry: + db "FLYCATCHER@" db 3,3 - dw 260 - text_far _WigglytuffDexEntry + dw 140 + text_far _WeepinbellDexEntry text_end -EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 - text_far _EeveeDexEntry +VictreebelDexEntry: + db "FLYCATCHER@" + db 5,7 + dw 340 + text_far _VictreebelDexEntry text_end -FlareonDexEntry: - db "FLAME@" +TentacoolDexEntry: + db "JELLYFISH@" db 2,11 - dw 550 - text_far _FlareonDexEntry + dw 1000 + text_far _TentacoolDexEntry text_end -JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 - text_far _JolteonDexEntry +TentacruelDexEntry: + db "JELLYFISH@" + db 5,3 + dw 1210 + text_far _TentacruelDexEntry text_end -VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 - text_far _VaporeonDexEntry +GeodudeDexEntry: + db "ROCK@" + db 1,4 + dw 440 + text_far _GeodudeDexEntry text_end -MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 - text_far _MachopDexEntry +GravelerDexEntry: + db "ROCK@" + db 3,3 + dw 2320 + text_far _GravelerDexEntry text_end -ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 - text_far _ZubatDexEntry +GolemDexEntry: + db "MEGATON@" + db 4,7 + dw 6620 + text_far _GolemDexEntry text_end -EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 - text_far _EkansDexEntry +PonytaDexEntry: + db "FIRE HORSE@" + db 3,3 + dw 660 + text_far _PonytaDexEntry text_end -ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 - text_far _ParasDexEntry +RapidashDexEntry: + db "FIRE HORSE@" + db 5,7 + dw 2090 + text_far _RapidashDexEntry text_end -PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 - text_far _PoliwhirlDexEntry +SlowpokeDexEntry: + db "DOPEY@" + db 3,11 + dw 790 + text_far _SlowpokeDexEntry text_end -PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 - text_far _PoliwrathDexEntry +SlowbroDexEntry: + db "HERMITCRAB@" + db 5,3 + dw 1730 + text_far _SlowbroDexEntry text_end -WeedleDexEntry: - db "HAIRY BUG@" +MagnemiteDexEntry: + db "MAGNET@" db 1,0 - dw 70 - text_far _WeedleDexEntry + dw 130 + text_far _MagnemiteDexEntry text_end -KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 - text_far _KakunaDexEntry +MagnetonDexEntry: + db "MAGNET@" + db 3,3 + dw 1320 + text_far _MagnetonDexEntry text_end -BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 - text_far _BeedrillDexEntry +FarfetchdDexEntry: + db "WILD DUCK@" + db 2,7 + dw 330 + text_far _FarfetchdDexEntry + text_end + +DoduoDexEntry: + db "TWIN BIRD@" + db 4,7 + dw 860 + text_far _DoduoDexEntry text_end DodrioDexEntry: @@ -874,25 +790,11 @@ DodrioDexEntry: text_far _DodrioDexEntry text_end -PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 - text_far _PrimeapeDexEntry - text_end - -DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 - text_far _DugtrioDexEntry - text_end - -VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 - text_far _VenomothDexEntry +SeelDexEntry: + db "SEA LION@" + db 3,7 + dw 1980 + text_far _SeelDexEntry text_end DewgongDexEntry: @@ -902,81 +804,81 @@ DewgongDexEntry: text_far _DewgongDexEntry text_end -CaterpieDexEntry: - db "WORM@" - db 1,0 - dw 60 - text_far _CaterpieDexEntry +GrimerDexEntry: + db "SLUDGE@" + db 2,11 + dw 660 + text_far _GrimerDexEntry text_end -MetapodDexEntry: - db "COCOON@" - db 2,4 - dw 220 - text_far _MetapodDexEntry +MukDexEntry: + db "SLUDGE@" + db 3,11 + dw 660 + text_far _MukDexEntry text_end -ButterfreeDexEntry: - db "BUTTERFLY@" - db 3,7 - dw 710 - text_far _ButterfreeDexEntry +ShellderDexEntry: + db "BIVALVE@" + db 1,0 + dw 90 + text_far _ShellderDexEntry text_end -MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 - text_far _MachampDexEntry +CloysterDexEntry: + db "BIVALVE@" + db 4,11 + dw 2920 + text_far _CloysterDexEntry text_end -GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 - text_far _GolduckDexEntry +GastlyDexEntry: + db "GAS@" + db 4,3 + dw 2 + text_far _GastlyDexEntry text_end -HypnoDexEntry: - db "HYPNOSIS@" +HaunterDexEntry: + db "GAS@" db 5,3 - dw 1670 - text_far _HypnoDexEntry + dw 2 + text_far _HaunterDexEntry text_end -GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 - text_far _GolbatDexEntry +GengarDexEntry: + db "SHADOW@" + db 4,11 + dw 890 + text_far _GengarDexEntry text_end -MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 - text_far _MewtwoDexEntry +OnixDexEntry: + db "ROCK SNAKE@" + db 28,10 + dw 4630 + text_far _OnixDexEntry text_end -SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 - text_far _SnorlaxDexEntry +DrowzeeDexEntry: + db "HYPNOSIS@" + db 3,3 + dw 710 + text_far _DrowzeeDexEntry text_end -MagikarpDexEntry: - db "FISH@" - db 2,11 - dw 220 - text_far _MagikarpDexEntry +HypnoDexEntry: + db "HYPNOSIS@" + db 5,3 + dw 1670 + text_far _HypnoDexEntry text_end -MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 - text_far _MukDexEntry +KrabbyDexEntry: + db "RIVER CRAB@" + db 1,4 + dw 140 + text_far _KrabbyDexEntry text_end KinglerDexEntry: @@ -986,11 +888,11 @@ KinglerDexEntry: text_far _KinglerDexEntry text_end -CloysterDexEntry: - db "BIVALVE@" - db 4,11 - dw 2920 - text_far _CloysterDexEntry +VoltorbDexEntry: + db "BALL@" + db 1,8 + dw 230 + text_far _VoltorbDexEntry text_end ElectrodeDexEntry: @@ -1000,25 +902,25 @@ ElectrodeDexEntry: text_far _ElectrodeDexEntry text_end -ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 - text_far _ClefableDexEntry +ExeggcuteDexEntry: + db "EGG@" + db 1,4 + dw 60 + text_far _ExeggcuteDexEntry text_end -WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 - text_far _WeezingDexEntry +ExeggutorDexEntry: + db "COCONUT@" + db 6,7 + dw 2650 + text_far _ExeggutorDexEntry text_end -PersianDexEntry: - db "CLASSY CAT@" - db 3,3 - dw 710 - text_far _PersianDexEntry +CuboneDexEntry: + db "LONELY@" + db 1,4 + dw 140 + text_far _CuboneDexEntry text_end MarowakDexEntry: @@ -1028,67 +930,88 @@ MarowakDexEntry: text_far _MarowakDexEntry text_end -HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 - text_far _HaunterDexEntry +HitmonleeDexEntry: + db "KICKING@" + db 4,11 + dw 1100 + text_far _HitmonleeDexEntry text_end -AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 - text_far _AbraDexEntry +HitmonchanDexEntry: + db "PUNCHING@" + db 4,7 + dw 1110 + text_far _HitmonchanDexEntry text_end -AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 - text_far _AlakazamDexEntry +LickitungDexEntry: + db "LICKING@" + db 3,11 + dw 1440 + text_far _LickitungDexEntry text_end -PidgeottoDexEntry: - db "BIRD@" - db 3,7 - dw 660 - text_far _PidgeottoDexEntry +KoffingDexEntry: + db "POISON GAS@" + db 2,0 + dw 20 + text_far _KoffingDexEntry text_end -PidgeotDexEntry: - db "BIRD@" - db 4,11 - dw 870 - text_far _PidgeotDexEntry +WeezingDexEntry: + db "POISON GAS@" + db 3,11 + dw 210 + text_far _WeezingDexEntry text_end -StarmieDexEntry: - db "MYSTERIOUS@" +RhyhornDexEntry: + db "SPIKES@" + db 3,3 + dw 2540 + text_far _RhyhornDexEntry + text_end + +RhydonDexEntry: + db "DRILL@" + db 6,3 + dw 2650 + text_far _RhydonDexEntry + text_end + +ChanseyDexEntry: + db "EGG@" db 3,7 - dw 1760 - text_far _StarmieDexEntry + dw 760 + text_far _ChanseyDexEntry text_end -BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 - text_far _BulbasaurDexEntry +TangelaDexEntry: + db "VINE@" + db 3,3 + dw 770 + text_far _TangelaDexEntry text_end -VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 - text_far _VenusaurDexEntry +KangaskhanDexEntry: + db "PARENT@" + db 7,3 + dw 1760 + text_far _KangaskhanDexEntry text_end -TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 - text_far _TentacruelDexEntry +HorseaDexEntry: + db "DRAGON@" + db 1,4 + dw 180 + text_far _HorseaDexEntry + text_end + +SeadraDexEntry: + db "DRAGON@" + db 3,11 + dw 550 + text_far _SeadraDexEntry text_end GoldeenDexEntry: @@ -1105,53 +1028,123 @@ SeakingDexEntry: text_far _SeakingDexEntry text_end -PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 +StaryuDexEntry: + db "STARSHAPE@" + db 2,7 + dw 760 + text_far _StaryuDexEntry + text_end + +StarmieDexEntry: + db "MYSTERIOUS@" + db 3,7 + dw 1760 + text_far _StarmieDexEntry + text_end + +MrMimeDexEntry: + db "BARRIER@" + db 4,3 + dw 1200 + text_far _MrMimeDexEntry + text_end + +ScytherDexEntry: + db "MANTIS@" + db 4,11 + dw 1230 + text_far _ScytherDexEntry + text_end + +JynxDexEntry: + db "HUMANSHAPE@" + db 4,7 + dw 900 + text_far _JynxDexEntry + text_end + +ElectabuzzDexEntry: + db "ELECTRIC@" + db 3,7 dw 660 - text_far _PonytaDexEntry + text_far _ElectabuzzDexEntry text_end -RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 - text_far _RapidashDexEntry +MagmarDexEntry: + db "SPITFIRE@" + db 4,3 + dw 980 + text_far _MagmarDexEntry text_end -RattataDexEntry: - db "RAT@" - db 1,0 - dw 80 - text_far _RattataDexEntry +PinsirDexEntry: + db "STAGBEETLE@" + db 4,11 + dw 1210 + text_far _PinsirDexEntry text_end -RaticateDexEntry: - db "RAT@" - db 2,4 - dw 410 - text_far _RaticateDexEntry +TaurosDexEntry: + db "WILD BULL@" + db 4,7 + dw 1950 + text_far _TaurosDexEntry text_end -NidorinoDexEntry: - db "POISON PIN@" +MagikarpDexEntry: + db "FISH@" db 2,11 - dw 430 - text_far _NidorinoDexEntry + dw 220 + text_far _MagikarpDexEntry text_end -NidorinaDexEntry: - db "POISON PIN@" +GyaradosDexEntry: + db "ATROCIOUS@" + db 21,4 + dw 5180 + text_far _GyaradosDexEntry + text_end + +LaprasDexEntry: + db "TRANSPORT@" + db 8,2 + dw 4850 + text_far _LaprasDexEntry + text_end + +DittoDexEntry: + db "TRANSFORM@" + db 1,0 + dw 90 + text_far _DittoDexEntry + text_end + +EeveeDexEntry: + db "EVOLUTION@" + db 1,0 + dw 140 + text_far _EeveeDexEntry + text_end + +VaporeonDexEntry: + db "BUBBLE JET@" + db 3,3 + dw 640 + text_far _VaporeonDexEntry + text_end + +JolteonDexEntry: + db "LIGHTNING@" db 2,7 - dw 440 - text_far _NidorinaDexEntry + dw 540 + text_far _JolteonDexEntry text_end -GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 - text_far _GeodudeDexEntry +FlareonDexEntry: + db "FLAME@" + db 2,11 + dw 550 + text_far _FlareonDexEntry text_end PorygonDexEntry: @@ -1161,95 +1154,102 @@ PorygonDexEntry: text_far _PorygonDexEntry text_end -AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 - text_far _AerodactylDexEntry +OmanyteDexEntry: + db "SPIRAL@" + db 1,4 + dw 170 + text_far _OmanyteDexEntry text_end -MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 - text_far _MagnemiteDexEntry +OmastarDexEntry: + db "SPIRAL@" + db 3,3 + dw 770 + text_far _OmastarDexEntry text_end -CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 - text_far _CharmanderDexEntry +KabutoDexEntry: + db "SHELLFISH@" + db 1,8 + dw 250 + text_far _KabutoDexEntry text_end -SquirtleDexEntry: - db "TINYTURTLE@" - db 1,8 - dw 200 - text_far _SquirtleDexEntry +KabutopsDexEntry: + db "SHELLFISH@" + db 4,3 + dw 890 + text_far _KabutopsDexEntry text_end -CharmeleonDexEntry: - db "FLAME@" - db 3,7 - dw 420 - text_far _CharmeleonDexEntry +AerodactylDexEntry: + db "FOSSIL@" + db 5,11 + dw 1300 + text_far _AerodactylDexEntry text_end -WartortleDexEntry: - db "TURTLE@" - db 3,3 - dw 500 - text_far _WartortleDexEntry +SnorlaxDexEntry: + db "SLEEPING@" + db 6,11 + dw 10140 + text_far _SnorlaxDexEntry text_end -CharizardDexEntry: - db "FLAME@" +ArticunoDexEntry: + db "FREEZE@" db 5,7 - dw 2000 - text_far _CharizardDexEntry + dw 1220 + text_far _ArticunoDexEntry text_end -OddishDexEntry: - db "WEED@" - db 1,8 - dw 120 - text_far _OddishDexEntry +ZapdosDexEntry: + db "ELECTRIC@" + db 5,3 + dw 1160 + text_far _ZapdosDexEntry text_end -GloomDexEntry: - db "WEED@" - db 2,7 - dw 190 - text_far _GloomDexEntry +MoltresDexEntry: + db "FLAME@" + db 6,7 + dw 1320 + text_far _MoltresDexEntry text_end -VileplumeDexEntry: - db "FLOWER@" - db 3,11 - dw 410 - text_far _VileplumeDexEntry +DratiniDexEntry: + db "DRAGON@" + db 5,11 + dw 70 + text_far _DratiniDexEntry text_end -BellsproutDexEntry: - db "FLOWER@" - db 2,4 - dw 90 - text_far _BellsproutDexEntry +DragonairDexEntry: + db "DRAGON@" + db 13,1 + dw 360 + text_far _DragonairDexEntry text_end -WeepinbellDexEntry: - db "FLYCATCHER@" - db 3,3 - dw 140 - text_far _WeepinbellDexEntry +DragoniteDexEntry: + db "DRAGON@" + db 7,3 + dw 4630 + text_far _DragoniteDexEntry text_end -VictreebelDexEntry: - db "FLYCATCHER@" - db 5,7 - dw 340 - text_far _VictreebelDexEntry +MewtwoDexEntry: + db "GENETIC@" + db 6,7 + dw 2690 + text_far _MewtwoDexEntry + text_end + +MewDexEntry: + db "NEW SPECIE@" + db 1,4 + dw 90 + text_far _MewDexEntry text_end MissingNoDexEntry: diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index cdb7e179..7e84a83d 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -1,1509 +1,1508 @@ -_RhydonDexEntry:: - text "Protected by an" - next "armor-like hide," - next "it is capable of" +_BulbasaurDexEntry:: + text "It can go for days" + next "without eating a" + next "single morsel." - page "living in molten" - next "lava of 3,600" - next "degrees" + page "In the bulb on" + next "its back, it" + next "stores energy" dex -_KangaskhanDexEntry:: - text "The infant rarely" - next "ventures out of" - next "its mother's" +_IvysaurDexEntry:: + text "The bulb on its" + next "back grows by" + next "drawing energy." - page "protective pouch" - next "until it is 3" - next "years old" + page "It gives off an" + next "aroma when it is" + next "ready to bloom" dex -_NidoranMDexEntry:: - text "Stiffens its ears" - next "to sense danger." - next "The larger its" +_VenusaurDexEntry:: + text "The flower on its" + next "back catches the" + next "sun's rays." - page "horns, the more" - next "powerful its" - next "secreted venom" + page "The sunlight is" + next "then absorbed and" + next "used for energy" dex -_ClefairyDexEntry:: - text "Its magical and" - next "cute appeal has" - next "many admirers." +_CharmanderDexEntry:: + text "The flame at the" + next "tip of its tail" + next "makes a sound as" - page "It is rare and" - next "found only in" - next "certain areas" + page "it burns. You can" + next "only hear it in" + next "quiet places" dex -_SpearowDexEntry:: - text "Eats bugs in" - next "grassy areas. It" - next "has to flap its" +_CharmeleonDexEntry:: + text "Tough fights could" + next "excite this" + next "#MON. When" - page "short wings at" - next "high speed to" - next "stay airborne" + page "excited, it may" + next "blow out bluish-" + next "white flames" dex -_VoltorbDexEntry:: - text "Usually found in" - next "power plants." - next "Easily mistaken" +_CharizardDexEntry:: + text "When expelling a" + next "blast of super" + next "hot fire, the red" - page "for a # BALL," - next "they have zapped" - next "many people" + page "flame at the tip" + next "of its tail burns" + next "more intensely" dex -_NidokingDexEntry:: - text "It uses its" - next "powerful tail in" - next "battle to smash," +_SquirtleDexEntry:: + text "Shoots water at" + next "prey while in the" + next "water." - page "constrict, then" - next "break the prey's" - next "bones" + page "Withdraws into" + next "its shell when in" + next "danger" dex -_SlowbroDexEntry:: - text "The SHELLDER that" - next "is latched onto" - next "SLOWPOKE's tail" +_WartortleDexEntry:: + text "When tapped, this" + next "#MON will pull" + next "in its head, but" - page "is said to feed" - next "on the host's left" - next "over scraps" + page "its tail will" + next "still stick out a" + next "little bit" dex -_IvysaurDexEntry:: - text "When the bulb on" - next "its back grows" - next "large, it appears" +_BlastoiseDexEntry:: + text "Once it takes aim" + next "at its enemy, it" + next "blasts out water" - page "to lose the" - next "ability to stand" - next "on its hind legs" + page "with even more" + next "force than a fire" + next "hose" dex -_ExeggutorDexEntry:: - text "Legend has it that" - next "on rare occasions," - next "one of its heads" +_CaterpieDexEntry:: + text "If you touch the" + next "feeler on top of" + next "its head, it will" - page "will drop off and" - next "continue on as an" - next "EXEGGCUTE" + page "release a horrible" + next "stink to protect" + next "itself" dex -_LickitungDexEntry:: - text "Its tongue can be" - next "extended like a" - next "chameleon's. It" +_MetapodDexEntry:: + text "Hardens its shell" + next "to protect itself." + next "However, a large" - page "leaves a tingling" - next "sensation when it" - next "licks enemies" + page "impact may cause" + next "it to pop out of" + next "its shell" dex -_ExeggcuteDexEntry:: - text "Often mistaken" - next "for eggs." - next "When disturbed," +_ButterfreeDexEntry:: + text "Its wings, covered" + next "with poisonous" + next "powders, repel" - page "they quickly" - next "gather and attack" - next "in swarms" + page "water. This" + next "allows it to fly" + next "in the rain" dex -_GrimerDexEntry:: - text "Appears in filthy" - next "areas. Thrives by" - next "sucking up" +_WeedleDexEntry:: + text "Beware of the" + next "sharp stinger on" + next "its head. It" - page "polluted sludge" - next "that is pumped" - next "out of factories" + page "hides in grass" + next "and bushes where" + next "it eats leaves" dex -_GengarDexEntry:: - text "Under a full moon," - next "this #MON" - next "likes to mimic" +_KakunaDexEntry:: + text "Able to move only" + next "slightly. When" + next "endangered, it" - page "the shadows of" - next "people and laugh" - next "at their fright" + page "may stick out its" + next "stinger and poison" + next "its enemy" dex -_NidoranFDexEntry:: - text "Although small," - next "its venomous" - next "barbs render this" +_BeedrillDexEntry:: + text "It has 3 poisonous" + next "stingers on its" + next "forelegs and its" - page "#MON dangerous." - next "The female has" - next "smaller horns" + page "tail. They are" + next "used to jab its" + next "enemy repeatedly" dex -_NidoqueenDexEntry:: - text "Its hard scales" - next "provide strong" - next "protection. It" +_PidgeyDexEntry:: + text "Very docile. If" + next "attacked, it will" + next "often kick up" - page "uses its hefty" - next "bulk to execute" - next "powerful moves" + page "sand to protect" + next "itself rather" + next "than fight back" dex -_CuboneDexEntry:: - text "Because it never" - next "removes its skull" - next "helmet, no one" +_PidgeottoDexEntry:: + text "This #MON is" + next "full of vitality." + next "It constantly" - page "has ever seen" - next "this #MON's" - next "real face" + page "flies around its" + next "large territory in" + next "search of prey" dex -_RhyhornDexEntry:: - text "Its massive bones" - next "are 1000 times" - next "harder than human" +_PidgeotDexEntry:: + text "This #MON flies" + next "at Mach 2 speed," + next "seeking prey." - page "bones. It can" - next "easily knock a" - next "trailer flying" + page "Its large talons" + next "are feared as" + next "wicked weapons" dex -_LaprasDexEntry:: - text "A #MON that" - next "has been over-" - next "hunted almost to" +_RattataDexEntry:: + text "Will chew on any-" + next "thing with its" + next "fangs. If you see" - page "extinction. It" - next "can ferry people" - next "across the water" + page "one, it is certain" + next "that 40 more live" + next "in the area" dex -_ArcanineDexEntry:: - text "A #MON that" - next "has been admired" - next "since the past" +_RaticateDexEntry:: + text "Its hind feet are" + next "webbed. They act" + next "as flippers, so" - page "for its beauty." - next "It runs agilely" - next "as if on wings" + page "it can swim in" + next "rivers and hunt" + next "for prey" dex -_MewDexEntry:: - text "So rare that it" - next "is still said to" - next "be a mirage by" +_SpearowDexEntry:: + text "Inept at flying" + next "high. However, it" + next "can fly around" - page "many experts. Only" - next "a few people have" - next "seen it worldwide" + page "very fast to" + next "protect its ter-" + next "ritory" dex -_GyaradosDexEntry:: - text "Rarely seen in" - next "the wild. Huge" - next "and vicious, it" +_FearowDexEntry:: + text "A #MON that" + next "dates back many" + next "years. If it" - page "is capable of" - next "destroying entire" - next "cities in a rage" + page "senses danger, it" + next "flies high and" + next "away, instantly" dex -_ShellderDexEntry:: - text "Its hard shell" - next "repels any kind" - next "of attack." +_EkansDexEntry:: + text "The older it gets," + next "the longer it" + next "grows. At night," - page "It is vulnerable" - next "only when its" - next "shell is open" + page "it wraps its long" + next "body around tree" + next "branches to rest" dex -_TentacoolDexEntry:: - text "Drifts in shallow" - next "seas. Anglers who" - next "hook them by" +_ArbokDexEntry:: + text "The frightening" + next "patterns on its" + next "belly have been" - page "accident are" - next "often punished by" - next "its stinging acid" + page "studied. Six" + next "variations have" + next "been confirmed" dex -_GastlyDexEntry:: - text "Almost invisible," - next "this gaseous" - next "#MON cloaks" +_PikachuDexEntry:: + text "It keeps its tail" + next "raised to monitor" + next "its surroundings." - page "the target and" - next "puts it to sleep" - next "without notice" + page "If you yank its" + next "tail, it will try" + next "to bite you" dex -_ScytherDexEntry:: - text "With ninja-like" - next "agility and speed," - next "it can create the" +_RaichuDexEntry:: + text "When electricity" + next "builds up inside" + next "its body, it" - page "illusion that" - next "there is more" - next "than one" + page "becomes feisty." + next "It also glows in" + next "the dark" dex -_StaryuDexEntry:: - text "An enigmatic" - next "#MON that can" - next "effortlessly" +_SandshrewDexEntry:: + text "Its body is dry." + next "When it gets cold" + next "at night, its" - page "regenerate any" - next "appendage it" - next "loses in battle" + page "hide is said to" + next "become coated with" + next "a fine dew" dex -_BlastoiseDexEntry:: - text "A brutal #MON" - next "with pressurized" - next "water jets on its" +_SandslashDexEntry:: + text "It is skilled at" + next "slashing enemies" + next "with its claws." - page "shell. They are" - next "used for high" - next "speed tackles" + page "If broken, they" + next "start to grow back" + next "in a day" dex -_PinsirDexEntry:: - text "If it fails to" - next "crush the victim" - next "in its pincers," +_NidoranFDexEntry:: + text "A mild-mannered" + next "#MON that does" + next "not like to" - page "it will swing it" - next "around and toss" - next "it hard" + page "fight. Beware, its" + next "small horns" + next "secrete venom" dex -_TangelaDexEntry:: - text "The whole body is" - next "swathed with wide" - next "vines that are" +_NidorinaDexEntry:: + text "When resting deep" + next "in its burrow, its" + next "thorns always" - page "similar to sea-" - next "weed. Its vines" - next "shake as it walks" + page "retract." + next "This is proof that" + next "it is relaxed" dex -_GrowlitheDexEntry:: - text "Very protective" - next "of its territory." - next "It will bark and" +_NidoqueenDexEntry:: + text "Tough scales cover" + next "the sturdy body" + next "of this #MON." - page "bite to repel" - next "intruders from" - next "its space" + page "It appears that" + next "the scales grow" + next "in cycles" dex -_OnixDexEntry:: - text "As it grows, the" - next "stone portions of" - next "its body harden" +_NidoranMDexEntry:: + text "Its large ears" + next "are always kept" + next "upright. If it" - page "to become similar" - next "to a diamond, but" - next "colored black" + page "senses danger, it" + next "will attack with a" + next "poisonous sting" dex -_FearowDexEntry:: - text "With its huge and" - next "magnificent wings," - next "it can keep aloft" +_NidorinoDexEntry:: + text "Its horns contain" + next "venom. If they" + next "are stabbed into" - page "without ever" - next "having to land" - next "for rest" + page "an enemy, the" + next "impact makes the" + next "poison leak out" dex -_PidgeyDexEntry:: - text "A common sight in" - next "forests and woods." - next "It flaps its" +_NidokingDexEntry:: + text "Its steel-like" + next "hide adds to its" + next "powerful tackle." - page "wings at ground" - next "level to kick up" - next "blinding sand" + page "Its horns are so" + next "hard, they can" + next "pierce a diamond" dex -_SlowpokeDexEntry:: - text "Incredibly slow" - next "and dopey. It" - next "takes 5 seconds" +_ClefairyDexEntry:: + text "Adored for their" + next "cute looks and" + next "playfulness. They" - page "for it to feel" - next "pain when under" - next "attack" + page "are thought to be" + next "rare, as they do" + next "not appear often" dex -_KadabraDexEntry:: - text "It emits special" - next "alpha waves from" - next "its body that" +_ClefableDexEntry:: + text "They appear to be" + next "very protective of" + next "their own world." - page "induce headaches" - next "just by being" - next "close by" + page "It is a kind of" + next "fairy, rarely seen" + next "by people" dex -_GravelerDexEntry:: - text "Rolls down slopes" - next "to move. It rolls" - next "over any obstacle" +_VulpixDexEntry:: + text "Both its fur and" + next "its tails are" + next "beautiful. As it" - page "without slowing" - next "or changing its" - next "direction" + page "grows, the tails" + next "split and form" + next "more tails" dex -_ChanseyDexEntry:: - text "A rare and elusive" - next "#MON that is" - next "said to bring" +_NinetalesDexEntry:: + text "According to an" + next "enduring legend," + next "9 noble saints" - page "happiness to those" - next "who manage to get" - next "it" + page "were united and" + next "reincarnated as" + next "this #MON" dex -_MachokeDexEntry:: - text "Its muscular body" - next "is so powerful, it" - next "must wear a power" +_JigglypuffDexEntry:: + text "Uses its alluring" + next "eyes to enrapture" + next "its foe. It then" - page "save belt to be" - next "able to regulate" - next "its motions" + page "sings a pleasing" + next "melody that lulls" + next "the foe to sleep" dex -_MrMimeDexEntry:: - text "If interrupted" - next "while it is" - next "miming, it will" +_WigglytuffDexEntry:: + text "Its body is full" + next "of elasticity. By" + next "inhaling deeply," - page "slap around the" - next "offender with its" - next "broad hands" + page "it can continue" + next "to inflate itself" + next "without limit" dex -_HitmonleeDexEntry:: - text "When in a hurry," - next "its legs lengthen" - next "progressively." +_ZubatDexEntry:: + text "Emits ultrasonic" + next "cries while it" + next "flies. They act" - page "It runs smoothly" - next "with extra long," - next "loping strides" + page "as a sonar used" + next "to check for ob-" + next "jects in its way" dex -_HitmonchanDexEntry:: - text "While apparently" - next "doing nothing, it" - next "fires punches in" +_GolbatDexEntry:: + text "It attacks in a" + next "stealthy manner," + next "without warning." - page "lightning fast" - next "volleys that are" - next "impossible to see" + page "Its sharp fangs" + next "are used to bite" + next "and suck blood" dex -_ArbokDexEntry:: - text "It is rumored that" - next "the ferocious" - next "warning markings" +_OddishDexEntry:: + text "It may be mistaken" + next "for a clump of" + next "weeds. If you try" - page "on its belly" - next "differ from area" - next "to area" + page "to yank it out of" + next "the ground, it" + next "shrieks horribly" dex -_ParasectDexEntry:: - text "A host-parasite" - next "pair in which the" - next "parasite mushroom" +_GloomDexEntry:: + text "Smells incredibly" + next "foul! However," + next "around 1 out of" - page "has taken over the" - next "host bug. Prefers" - next "damp places" + page "1,000 people enjoy" + next "sniffing its nose-" + next "bending stink" dex -_PsyduckDexEntry:: - text "While lulling its" - next "enemies with its" - next "vacant look, this" +_VileplumeDexEntry:: + text "Flaps its broad" + next "flower petals to" + next "scatter its" - page "wily #MON will" - next "use psychokinetic" - next "powers" + page "poisonous pollen." + next "The flapping sound" + next "is very loud" dex -_DrowzeeDexEntry:: - text "Puts enemies to" - next "sleep then eats" - next "their dreams." +_ParasDexEntry:: + text "Burrows under the" + next "ground to gnaw on" + next "tree roots. The" - page "Occasionally gets" - next "sick from eating" - next "bad dreams" + page "mushrooms on its" + next "back absorb most" + next "of the nutrition" dex -_GolemDexEntry:: - text "Its boulder-like" - next "body is extremely" - next "hard. It can" +_ParasectDexEntry:: + text "The bug host is" + next "drained of energy" + next "by the mushrooms" - page "easily withstand" - next "dynamite blasts" - next "without damage" + page "on its back. They" + next "appear to do all" + next "the thinking" dex -_MagmarDexEntry:: - text "Its body always" - next "burns with an" - next "orange glow that" +_VenonatDexEntry:: + text "Its large eyes act" + next "as radars. In a" + next "bright place, you" - page "enables it to" - next "hide perfectly" - next "among flames" + page "can see that they" + next "are clusters of" + next "many tiny eyes" dex -_ElectabuzzDexEntry:: - text "Normally found" - next "near power plants," - next "they can wander" +_VenomothDexEntry:: + text "The powdery scales" + next "on its wings are" + next "hard to remove." - page "away and cause" - next "major blackouts" - next "in cities" + page "They also contain" + next "poison that leaks" + next "out on contact" dex -_MagnetonDexEntry:: - text "Formed by several" - next "MAGNEMITEs linked" - next "together. They" +_DiglettDexEntry:: + text "It prefers dark" + next "places. It spends" + next "most of its time" - page "frequently appear" - next "when sunspots" - next "flare up" + page "underground," + next "though it may pop" + next "up in caves" dex -_KoffingDexEntry:: - text "Because it stores" - next "several kinds of" - next "toxic gases in" +_DugtrioDexEntry:: + text "A team of triplets" + next "that can burrow" + next "over 60 MPH." - page "its body, it is" - next "prone to exploding" - next "without warning" + page "Due to this, some" + next "people think it's" + next "an earthquake" dex -_MankeyDexEntry:: - text "Extremely quick to" - next "anger. It could" - next "be docile one" +_MeowthDexEntry:: + text "Appears to be more" + next "active at night." + next "It loves round" - page "moment then" - next "thrashing away" - next "the next instant" + page "and shiny things." + next "It can't stop from" + next "picking them up" dex -_SeelDexEntry:: - text "The protruding" - next "horn on its head" - next "is very hard." +_PersianDexEntry:: + text "The gem in its" + next "forehead glows on" + next "its own! It walks" - page "It is used for" - next "bashing through" - next "thick ice" + page "with all the grace" + next "and elegance of a" + next "proud queen" dex -_DiglettDexEntry:: - text "Lives about one" - next "yard underground" - next "where it feeds on" +_PsyduckDexEntry:: + text "Always tormented" + next "by headaches." + next "It uses psychic" - page "plant roots. It" - next "sometimes appears" - next "above ground" + page "powers, but it is" + next "not known if it" + next "intends to do so" dex -_TaurosDexEntry:: - text "When it targets" - next "an enemy, it" - next "charges furiously" +_GolduckDexEntry:: + text "Its slim and long" + next "limbs end in broad" + next "flippers. They" - page "while whipping its" - next "body with its" - next "long tails" + page "are used for swim-" + next "ming gracefully" + next "in lakes" dex -_FarfetchdDexEntry:: - text "The sprig of" - next "green onions it" - next "holds is its" +_MankeyDexEntry:: + text "An agile #MON" + next "that lives in" + next "trees. It angers" - page "weapon. It is" - next "used much like a" - next "metal sword" + page "easily and will" + next "not hesitate to" + next "attack anything" dex -_VenonatDexEntry:: - text "Lives in the" - next "shadows of tall" - next "trees where it" +_PrimeapeDexEntry:: + text "It stops being" + next "angry only when" + next "nobody else is" - page "eats insects. It" - next "is attracted by" - next "light at night" + page "around. To view" + next "this moment is" + next "very difficult" dex -_DragoniteDexEntry:: - text "An extremely" - next "rarely seen" - next "marine #MON." +_GrowlitheDexEntry:: + text "A #MON with a" + next "friendly nature." + next "However, it will" - page "Its intelligence" - next "is said to match" - next "that of humans" + page "bark fiercely at" + next "anything invading" + next "its territory" dex -_DoduoDexEntry:: - text "A bird that makes" - next "up for its poor" - next "flying with its" +_ArcanineDexEntry:: + text "A legendary #-" + next "MON in China." + next "Many people are" - page "fast foot speed." - next "Leaves giant" - next "footprints" + page "charmed by its" + next "grace and beauty" + next "while running" dex _PoliwagDexEntry:: - text "Its newly grown" - next "legs prevent it" - next "from running. It" + text "The direction of" + next "the spiral on the" + next "belly differs by" - page "appears to prefer" - next "swimming than" - next "trying to stand" + page "area. It is more" + next "adept at swimming" + next "than walking" dex -_JynxDexEntry:: - text "It seductively" - next "wiggles its hips" - next "as it walks. It" +_PoliwhirlDexEntry:: + text "Under attack, it" + next "uses its belly " + next "spiral to put the" - page "can cause people" - next "to dance in" - next "unison with it" + page "foe to sleep. It" + next "then makes its" + next "escape" dex -_MoltresDexEntry:: - text "Known as the" - next "legendary bird of" - next "fire. Every flap" +_PoliwrathDexEntry:: + text "Swims powerfully" + next "using all the" + next "muscles in its" - page "of its wings" - next "creates a dazzling" - next "flash of flames" + page "body. It can even" + next "overtake champion" + next "swimmers" dex -_ArticunoDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear to" +_AbraDexEntry:: + text "Sleeps 18 hours a" + next "day. If it senses" + next "danger, it will" - page "doomed people who" - next "are lost in icy" - next "mountains" + page "teleport itself to" + next "safety even as it" + next "sleeps" dex -_ZapdosDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear" +_KadabraDexEntry:: + text "Many odd things" + next "happen if this" + next "#MON is close" - page "from clouds while" - next "dropping enormous" - next "lightning bolts" + page "by. For example," + next "it makes clocks" + next "run backwards" dex -_DittoDexEntry:: - text "Capable of copying" - next "an enemy's genetic" - next "code to instantly" +_AlakazamDexEntry:: + text "A #MON that can" + next "memorize anything." + next "It never forgets" - page "transform itself" - next "into a duplicate" - next "of the enemy" + page "what it learns--" + next "that's why this" + next "#MON is smart" dex -_MeowthDexEntry:: - text "Adores circular" - next "objects. Wanders" - next "the streets on a" +_MachopDexEntry:: + text "Very powerful in" + next "spite of its small" + next "size. Its mastery" - page "nightly basis to" - next "look for dropped" - next "loose change" + page "of many types of" + next "martial arts makes" + next "it very tough" dex -_KrabbyDexEntry:: - text "Its pincers are" - next "not only powerful" - next "weapons, they are" +_MachokeDexEntry:: + text "The belt around" + next "its waist holds" + next "back its energy." - page "used for balance" - next "when walking" - next "sideways" + page "Without it, this" + next "#MON would be" + next "unstoppable" dex -_VulpixDexEntry:: - text "At the time of" - next "birth, it has" - next "just one tail." +_MachampDexEntry:: + text "One arm alone can" + next "move mountains." + next "Using all four" - page "The tail splits" - next "from its tip as" - next "it grows older" + page "arms, this #MON" + next "fires off awesome" + next "punches" dex -_NinetalesDexEntry:: - text "Very smart and" - next "very vengeful." - next "Grabbing one of" +_BellsproutDexEntry:: + text "Prefers hot and" + next "humid places." + next "It ensnares tiny" - page "its many tails" - next "could result in a" - next "1000-year curse" + page "insects with its" + next "vines and devours" + next "them" dex -_PikachuDexEntry:: - text "When several of" - next "these #MON" - next "gather, their" +_WeepinbellDexEntry:: + text "When hungry, it" + next "swallows anything" + next "that moves. Its" - page "electricity could" - next "build and cause" - next "lightning storms" + page "hapless prey is" + next "melted inside by" + next "strong acids" dex -_RaichuDexEntry:: - text "Its long tail" - next "serves as a" - next "ground to protect" +_VictreebelDexEntry:: + text "Lures prey with" + next "the sweet aroma of" + next "honey. Swallowed" - page "itself from its" - next "own high voltage" - next "power" + page "whole, the prey is" + next "melted in a day," + next "bones and all" dex -_DratiniDexEntry:: - text "Long considered a" - next "mythical #MON" - next "until recently" +_TentacoolDexEntry:: + text "It can sometimes" + next "be found all dry" + next "and shriveled up" - page "when a small" - next "colony was found" - next "living underwater" + page "on a beach. Toss" + next "it back into the" + next "sea to revive it" dex -_DragonairDexEntry:: - text "A mystical #MON" - next "that exudes a" - next "gentle aura." +_TentacruelDexEntry:: + text "Its 80 tentacles" + next "can stretch and" + next "contract freely." - page "Has the ability" - next "to change climate" - next "conditions" + page "They wrap around" + next "prey and weaken" + next "it with poison" dex -_KabutoDexEntry:: - text "A #MON that" - next "was resurrected" - next "from a fossil" +_GeodudeDexEntry:: + text "Commonly found" + next "near mountain" + next "trails, etc." - page "found in what was" - next "once the ocean" - next "floor eons ago" + page "If you step on" + next "one by accident," + next "it gets angry" dex -_KabutopsDexEntry:: - text "Its sleek shape is" - next "perfect for swim-" - next "ming. It slashes" +_GravelerDexEntry:: + text "Often seen rolling" + next "down mountain" + next "trails. Obstacles" - page "prey with its" - next "claws and drains" - next "the body fluids" + page "are just things to" + next "roll straight" + next "over, not avoid" dex -_HorseaDexEntry:: - text "Known to shoot" - next "down flying bugs" - next "with precision" +_GolemDexEntry:: + text "Once it sheds its" + next "skin, its body" + next "turns tender and" - page "blasts of ink" - next "from the surface" - next "of the water" + page "whitish. Its hide" + next "hardens when it's" + next "exposed to air" dex -_SeadraDexEntry:: - text "Capable of swim-" - next "ming backwards by" - next "rapidly flapping" +_PonytaDexEntry:: + text "Capable of jumping" + next "incredibly high." + next "Its hooves and" - page "its wing-like" - next "pectoral fins and" - next "stout tail" + page "sturdy legs absorb" + next "the impact of a" + next "hard landing" dex -_SandshrewDexEntry:: - text "Burrows deep" - next "underground in" - next "arid locations" +_RapidashDexEntry:: + text "Just loves to run." + next "If it sees some-" + next "thing faster than" - page "far from water." - next "It only emerges" - next "to hunt for food" + page "itself, it will" + next "give chase at top" + next "speed" dex -_SandslashDexEntry:: - text "Curls up into a" - next "spiny ball when" - next "threatened. It" +_SlowpokeDexEntry:: + text "Incredibly slow" + next "and sluggish. It" + next "is quite content" - page "can roll while" - next "curled up to" - next "attack or escape" + page "to loll about" + next "without worrying" + next "about the time" dex -_OmanyteDexEntry:: - text "Although long" - next "extinct, in rare" - next "cases, it can be" +_SlowbroDexEntry:: + text "Lives lazily by" + next "the sea. If the" + next "SHELLDER on its" - page "genetically" - next "resurrected from" - next "fossils" + page "tail comes off," + next "it becomes a" + next "SLOWPOKE again" dex -_OmastarDexEntry:: - text "A prehistoric" - next "#MON that died" - next "out when its" +_MagnemiteDexEntry:: + text "It is born with" + next "the ability to" + next "defy gravity. It" - page "heavy shell made" - next "it impossible to" - next "catch prey" + page "floats in air on" + next "powerful electro-" + next "magnetic waves" dex -_JigglypuffDexEntry:: - text "When its huge eyes" - next "light up, it sings" - next "a mysteriously" +_MagnetonDexEntry:: + text "Generates strange" + next "radio signals. It" + next "raises the tem-" - page "soothing melody" - next "that lulls its" - next "enemies to sleep" + page "perature by 3.6F" + next "degrees within" + next "3,300 feet" dex -_WigglytuffDexEntry:: - text "The body is soft" - next "and rubbery. When" - next "angered, it will" +_FarfetchdDexEntry:: + text "Lives where reedy" + next "plants grow. They" + next "are rarely seen," - page "suck in air and" - next "inflate itself to" - next "an enormous size" + page "so it's thought" + next "their numbers are" + next "decreasing" dex -_EeveeDexEntry:: - text "Its genetic code" - next "is irregular." - next "It may mutate if" +_DoduoDexEntry:: + text "Its short wings" + next "make flying dif-" + next "ficult. Instead," - page "it is exposed to" - next "radiation from" - next "element STONEs" + page "this #MON runs" + next "at high speed on" + next "developed legs" dex -_FlareonDexEntry:: - text "When storing" - next "thermal energy in" - next "its body, its" +_DodrioDexEntry:: + text "One of DODUO's 2" + next "heads splits to" + next "form a unique" - page "temperature could" - next "soar to over 1600" - next "degrees" + page "species. It runs" + next "close to 40 MPH" + next "in prairies" dex -_JolteonDexEntry:: - text "It accumulates" - next "negative ions in" - next "the atmosphere to" +_SeelDexEntry:: + text "Loves freezing" + next "cold conditions." + next "Relishes swimming" - page "blast out 10000-" - next "volt lightning" - next "bolts" + page "in a frigid cli-" + next "mate of around 14F" + next "degrees" dex -_VaporeonDexEntry:: - text "Lives close to" - next "water. Its long" - next "tail is ridged" +_DewgongDexEntry:: + text "Its entire body is" + next "a snowy-white." + next "Unharmed by even" - page "with a fin which" - next "is often mistaken" - next "for a mermaid's" + page "intense cold, it" + next "swims powerfully" + next "in icy waters" dex -_MachopDexEntry:: - text "Loves to build" - next "its muscles." - next "It trains in all" +_GrimerDexEntry:: + text "Made of hardened" + next "sludge. It smells" + next "too putrid to" - page "styles of martial" - next "arts to become" - next "even stronger" + page "touch." + next "Even weeds won't" + next "grow in its path" dex -_ZubatDexEntry:: - text "Forms colonies in" - next "perpetually dark" - next "places. Uses" +_MukDexEntry:: + text "Smells so awful," + next "it can cause" + next "fainting. Through" - page "ultrasonic waves" - next "to identify and" - next "approach targets" + page "degeneration, it" + next "lost its sense of" + next "smell" dex -_EkansDexEntry:: - text "Moves silently" - next "and stealthily." - next "Eats the eggs of" +_ShellderDexEntry:: + text "The shell can" + next "withstand any" + next "attack. However," - page "birds, such as" - next "PIDGEY and" - next "SPEAROW, whole" + page "when it is open," + next "the tender body" + next "is exposed" dex -_ParasDexEntry:: - text "Burrows to suck" - next "tree roots. The" - next "mushrooms on its" +_CloysterDexEntry:: + text "For protection, it" + next "uses its harder-" + next "than-diamonds" - page "back grow by draw-" - next "ing nutrients from" - next "the bug host" + page "shell. It also" + next "shoots spikes from" + next "the shell" dex -_PoliwhirlDexEntry:: - text "Capable of living" - next "in or out of" - next "water. When out" +_GastlyDexEntry:: + text "Said to appear in" + next "decrepit, deserted" + next "buildings. It has" - page "of water, it" - next "sweats to keep" - next "its body slimy" + page "no real shape as" + next "it appears to be" + next "made of a gas" dex -_PoliwrathDexEntry:: - text "An adept swimmer" - next "at both the front" - next "crawl and breast" +_HaunterDexEntry:: + text "By licking, it" + next "saps the victim's" + next "life. It causes" - page "stroke. Easily" - next "overtakes the best" - next "human swimmers" + page "shaking that won't" + next "stop until the" + next "victim's demise" dex -_WeedleDexEntry:: - text "Often found in" - next "forests, eating" - next "leaves." +_GengarDexEntry:: + text "A GENGAR is close" + next "by if you feel a" + next "sudden chill." - page "It has a sharp" - next "venomous stinger" - next "on its head" + page "It may be trying" + next "to lay a curse" + next "on you" dex -_KakunaDexEntry:: - text "Almost incapable" - next "of moving, this" - next "#MON can only" +_OnixDexEntry:: + text "Burrows at high" + next "speed in search" + next "of food. The" - page "harden its shell" - next "to protect itself" - next "from predators" + page "tunnels it leaves" + next "are used as homes" + next "by DIGLETTs" dex -_BeedrillDexEntry:: - text "Flies at high" - next "speed and attacks" - next "using its large" +_DrowzeeDexEntry:: + text "If you sleep by" + next "it all the time," + next "it will sometimes" - page "venomous stingers" - next "on its forelegs" - next "and tail" + page "show you dreams" + next "it has eaten in" + next "the past" dex -_DodrioDexEntry:: - text "Uses its three" - next "brains to execute" - next "complex plans." +_HypnoDexEntry:: + text "Avoid eye contact" + next "if you come across" + next "one. It will try" - page "While two heads" - next "sleep, one head" - next "stays awake" + page "to put you to" + next "sleep by using" + next "its pendulum" dex -_PrimeapeDexEntry:: - text "Always furious" - next "and tenacious to" - next "boot. It will not" +_KrabbyDexEntry:: + text "Its pincers are" + next "superb weapons." + next "They sometimes" - page "abandon chasing" - next "its quarry until" - next "it is caught" + page "break off during" + next "battle, but they" + next "grow back fast" dex -_DugtrioDexEntry:: - text "A team of DIGLETT" - next "triplets." - next "It triggers huge" +_KinglerDexEntry:: + text "One claw grew" + next "massively and as" + next "hard as steel." - page "earthquakes by" - next "burrowing 60 miles" - next "underground" + page "It has 10,000-HP" + next "strength. However," + next "it is too heavy" dex -_VenomothDexEntry:: - text "The dust-like" - next "scales covering" - next "its wings are" +_VoltorbDexEntry:: + text "It is said to" + next "camouflage itself" + next "as a # BALL. It" - page "color coded to" - next "indicate the kinds" - next "of poison it has" + page "will self-destruct" + next "with very little" + next "stimulus" dex -_DewgongDexEntry:: - text "Stores thermal" - next "energy in its" - next "body. Swims at a" +_ElectrodeDexEntry:: + text "Stores electrical" + next "energy inside its" + next "body. Even the" - page "steady 8 knots" - next "even in intensely" - next "cold waters" + page "slightest shock" + next "could trigger a" + next "huge explosion" dex -_CaterpieDexEntry:: - text "Its short feet" - next "are tipped with" - next "suction pads that" +_ExeggcuteDexEntry:: + text "The heads attract" + next "each other and" + next "spin around." - page "enable it to" - next "tirelessly climb" - next "slopes and walls" + page "There must be 6" + next "heads for it to" + next "maintain balance" dex -_MetapodDexEntry:: - text "This #MON is" - next "vulnerable to" - next "attack while its" +_ExeggutorDexEntry:: + text "Its cries are very" + next "noisy. This is" + next "because each of" - page "shell is soft," - next "exposing its weak" - next "and tender body" + page "the 3 heads thinks" + next "about whatever it" + next "likes" dex -_ButterfreeDexEntry:: - text "In battle, it" - next "flaps its wings" - next "at high speed to" +_CuboneDexEntry:: + text "Wears the skull" + next "of its deceased" + next "mother. Its cries" - page "release highly" - next "toxic dust into" - next "the air" + page "echo inside the" + next "skull and come out" + next "as a sad melody" dex -_MachampDexEntry:: - text "Using its heavy" - next "muscles, it throws" - next "powerful punches" +_MarowakDexEntry:: + text "Small and weak," + next "this #MON is" + next "adept with its" - page "that can send the" - next "victim clear over" - next "the horizon" + page "bone club. It has" + next "grown more vicious" + next "over the ages" dex -_GolduckDexEntry:: - text "Often seen swim-" - next "ming elegantly by" - next "lake shores. It" +_HitmonleeDexEntry:: + text "When kicking, the" + next "sole of its foot" + next "turns as hard as" - page "is often mistaken" - next "for the Japanese" - next "monster, Kappa" + page "a diamond on im-" + next "pact and destroys" + next "its enemy" dex -_HypnoDexEntry:: - text "When it locks eyes" - next "with an enemy, it" - next "will use a mix of" +_HitmonchanDexEntry:: + text "Punches in cork-" + next "screw fashion. It" + next "can punch its way" - page "PSI moves such as" - next "HYPNOSIS and" - next "CONFUSION" + page "through a concrete" + next "wall in the same" + next "way as a drill" dex -_GolbatDexEntry:: - text "Once it strikes," - next "it will not stop" - next "draining energy" +_LickitungDexEntry:: + text "Its tongue spans" + next "almost 7 feet and" + next "moves more freely" - page "from the victim" - next "even if it gets" - next "too heavy to fly" + page "than its forelegs." + next "Its licks can" + next "cause paralysis" dex -_MewtwoDexEntry:: - text "It was created by" - next "a scientist after" - next "years of horrific" +_KoffingDexEntry:: + text "In hot places, its" + next "internal gases" + next "could expand and" - page "gene splicing and" - next "DNA engineering" - next "experiments" - dex + page "explode without" + next "any warning. Be" + next "very careful!@@" -_SnorlaxDexEntry:: - text "Very lazy. Just" - next "eats and sleeps." - next "As its rotund" +_WeezingDexEntry:: + text "It lives and grows" + next "by absorbing dust," + next "germs and poison" - page "bulk builds, it" - next "becomes steadily" - next "more slothful" + page "gases that are" + next "contained in toxic" + next "waste and garbage" dex -_MagikarpDexEntry:: - text "In the distant" - next "past, it was" - next "somewhat stronger" +_RhyhornDexEntry:: + text "A #MON with a" + next "one-track mind." + next "Once it charges, " - page "than the horribly" - next "weak descendants" - next "that exist today" + page "it won't stop" + next "running until it" + next "falls asleep" dex -_MukDexEntry:: - text "Thickly covered" - next "with a filthy," - next "vile sludge. It" +_RhydonDexEntry:: + text "Walks on its hind" + next "legs. Shows signs" + next "of intelligence." - page "is so toxic, even" - next "its footprints" - next "contain poison" + page "Its armor-like" + next "hide even repels" + next "molten lava" dex -_KinglerDexEntry:: - text "The large pincer" - next "has 10000 hp of" - next "crushing power." +_ChanseyDexEntry:: + text "A gentle and kind-" + next "hearted #MON" + next "that shares its" - page "However, its huge" - next "size makes it" - next "unwieldy to use" + page "nutritious eggs" + next "if it sees an" + next "injured #MON" dex -_CloysterDexEntry:: - text "When attacked, it" - next "launches its" - next "horns in quick" +_TangelaDexEntry:: + text "Its identity is" + next "obscured by masses" + next "of thick, blue" - page "volleys. Its" - next "innards have" - next "never been seen" + page "vines. The vines" + next "are said to never" + next "stop growing" dex -_ElectrodeDexEntry:: - text "It stores electric" - next "energy under very" - next "high pressure." +_KangaskhanDexEntry:: + text "Raises its young" + next "in its belly" + next "pouch. Won't run" - page "It often explodes" - next "with little or no" - next "provocation" + page "from any fight" + next "to keep its young" + next "protected" dex -_ClefableDexEntry:: - text "A timid fairy" - next "#MON that is" - next "rarely seen. It" +_HorseaDexEntry:: + text "If it senses any" + next "danger, it will" + next "vigorously spray" - page "will run and hide" - next "the moment it" - next "senses people" + page "water or a special" + next "type of ink from" + next "its mouth" dex -_WeezingDexEntry:: - text "Where two kinds" - next "of poison gases" - next "meet, 2 KOFFINGs" +_SeadraDexEntry:: + text "Touching the back" + next "fin causes numb-" + next "ness. It hooks" - page "can fuse into a" - next "WEEZING over many" - next "years" + page "its tail to coral" + next "to stay in place" + next "while sleeping" dex -_PersianDexEntry:: - text "Although its fur" - next "has many admirers," - next "it is tough to" +_GoldeenDexEntry:: + text "When it is time" + next "for them to lay" + next "eggs, they can be" - page "raise as a pet" - next "because of its" - next "fickle meanness" + page "seen swimming up" + next "rivers and falls" + next "in large groups" dex -_MarowakDexEntry:: - text "The bone it holds" - next "is its key weapon." - next "It throws the" +_SeakingDexEntry:: + text "It is the male's" + next "job to make a" + next "nest by carving" - page "bone skillfully" - next "like a boomerang" - next "to KO targets" + page "out boulders in a" + next "stream using the" + next "horn on its head" dex -_HaunterDexEntry:: - text "Because of its" - next "ability to slip" - next "through block" +_StaryuDexEntry:: + text "As long as the" + next "center section is" + next "unharmed, it can" - page "walls, it is said" - next "to be from an-" - next "other dimension" + page "grow back fully" + next "even if it is" + next "chopped to bits" dex -_AbraDexEntry:: - text "Using its ability" - next "to read minds, it" - next "will identify" +_StarmieDexEntry:: + text "The center section" + next "is named the core." + next "People think it" - page "impending danger" - next "and TELEPORT to" - next "safety" + page "is communicating" + next "when it glows in" + next "7 colors" dex -_AlakazamDexEntry:: - text "Its brain can out-" - next "perform a super-" - next "computer." +_MrMimeDexEntry:: + text "Always practices" + next "its pantomime act." + next "It makes enemies" - page "Its intelligence" - next "quotient is said" - next "to be 5,000" + page "believe something" + next "exists that" + next "really doesn't" dex -_PidgeottoDexEntry:: - text "Very protective" - next "of its sprawling" - next "territorial area," +_ScytherDexEntry:: + text "Leaps out of tall" + next "grass and slices" + next "prey with its" - page "this #MON will" - next "fiercely peck at" - next "any intruder" + page "scythes. The move-" + next "ment looks like" + next "that of a ninja" dex -_PidgeotDexEntry:: - text "When hunting, it" - next "skims the surface" - next "of water at high" +_JynxDexEntry:: + text "Appears to move" + next "to a rhythm of" + next "its own, as if it" - page "speed to pick off" - next "unwary prey such" - next "as MAGIKARP" + page "were dancing. It" + next "wiggles its hips" + next "as it walks" dex -_StarmieDexEntry:: - text "Its central core" - next "glows with the" - next "seven colors of" +_ElectabuzzDexEntry:: + text "If a major power" + next "outage occurs, it" + next "is certain that" - page "the rainbow. Some" - next "people value the" - next "core as a gem" + page "this #MON has" + next "eaten electricity" + next "at a power plant" dex -_BulbasaurDexEntry:: - text "A strange seed was" - next "planted on its" - next "back at birth." +_MagmarDexEntry:: + text "Born in an active" + next "volcano. Its body" + next "is always cloaked" - page "The plant sprouts" - next "and grows with" - next "this #MON" + page "in flames, so it" + next "looks like a big" + next "ball of fire" dex -_VenusaurDexEntry:: - text "The plant blooms" - next "when it is" - next "absorbing solar" +_PinsirDexEntry:: + text "Grips its prey in" + next "its pincers and" + next "squeezes hard! It" - page "energy. It stays" - next "on the move to" - next "seek sunlight" + page "can't move if it's" + next "cold, so it lives" + next "in warm places" dex -_TentacruelDexEntry:: - text "The tentacles are" - next "normally kept" - next "short. On hunts," +_TaurosDexEntry:: + text "A rowdy #MON" + next "with a lot of" + next "stamina. Once" - page "they are extended" - next "to ensnare and" - next "immobilize prey" + page "running, it won't" + next "stop until it hits" + next "something" dex -_GoldeenDexEntry:: - text "Its tail fin" - next "billows like an" - next "elegant ballroom" +_MagikarpDexEntry:: + text "Famous for being" + next "very unreliable." + next "It can be found" - page "dress, giving it" - next "the nickname of" - next "the Water Queen" + page "swimming in seas," + next "lakes, rivers and" + next "shallow puddles" dex -_SeakingDexEntry:: - text "In the autumn" - next "spawning season," - next "they can be seen" +_GyaradosDexEntry:: + text "Brutally vicious" + next "and enormously" + next "destructive." - page "swimming power-" - next "fully up rivers" - next "and creeks" + page "Known for totally" + next "destroying cities" + next "in ancient times" dex -_PonytaDexEntry:: - text "Its hooves are 10" - next "times harder than" - next "diamonds. It can" +_LaprasDexEntry:: + text "A gentle soul that" + next "can read the minds" + next "of people. It can" - page "trample anything" - next "completely flat" - next "in little time" + page "ferry people" + next "across the sea on" + next "its back" dex -_RapidashDexEntry:: - text "Very competitive," - next "this #MON will" - next "chase anything" +_DittoDexEntry:: + text "When it spots an" + next "enemy, its body" + next "transfigures into" - page "that moves fast" - next "in the hopes of" - next "racing it" + page "an almost perfect" + next "copy of its oppo-" + next "nent" dex -_RattataDexEntry:: - text "Bites anything" - next "when it attacks." - next "Small and very" +_EeveeDexEntry:: + text "Its genetic code" + next "is unstable, so it" + next "could evolve in" - page "quick, it is a" - next "common sight in" - next "many places" + page "a variety of ways." + next "There are only a" + next "few alive" dex -_RaticateDexEntry:: - text "It uses its whis-" - next "kers to maintain" - next "its balance." +_VaporeonDexEntry:: + text "Its cell structure" + next "is similar to" + next "water molecules." - page "It apparently" - next "slows down if" - next "they are cut off" + page "It will melt away" + next "and become invis-" + next "ible in water" dex -_NidorinoDexEntry:: - text "An aggressive" - next "#MON that is" - next "quick to attack." +_JolteonDexEntry:: + text "A sensitive #-" + next "MON that easily" + next "becomes sad or" - page "The horn on its" - next "head secretes a" - next "powerful venom" + page "angry. Every time" + next "its mood changes," + next "it charges power" dex -_NidorinaDexEntry:: - text "The female's horn" - next "develops slowly." - next "Prefers physical" +_FlareonDexEntry:: + text "It has a flame" + next "chamber inside its" + next "body. It inhales," - page "attacks such as" - next "clawing and" - next "biting" + page "then blows out" + next "fire that is over" + next "3,000F degrees" dex -_GeodudeDexEntry:: - text "Found in fields" - next "and mountains." - next "Mistaking them" +_PorygonDexEntry:: + text "The only #MON" + next "people anticipate" + next "can fly into" - page "for boulders," - next "people often step" - next "or trip on them" + page "space. None has" + next "managed the feat" + next "yet, however" dex -_PorygonDexEntry:: - text "A #MON that" - next "consists entirely" - next "of programming" +_OmanyteDexEntry:: + text "An ancient #MON" + next "that was recovered" + next "from a fossil. It" - page "code. Capable of" - next "moving freely in" - next "cyberspace" + page "swims by cleverly" + next "twisting its 10" + next "tentacles about" dex -_AerodactylDexEntry:: - text "A ferocious, pre-" - next "historic #MON" - next "that goes for the" +_OmastarDexEntry:: + text "Sharp beaks ring" + next "its mouth. Its" + next "shell was too big" - page "enemy's throat" - next "with its serrated" - next "saw-like fangs" + page "for it to move" + next "freely, so it" + next "became extinct" dex -_MagnemiteDexEntry:: - text "Uses anti-gravity" - next "to stay suspended." - next "Appears without" +_KabutoDexEntry:: + text "A #MON that was" + next "recovered from a" + next "fossil. It uses" - page "warning and uses" - next "THUNDER WAVE and" - next "similar moves" + page "the eyes on its" + next "back while hiding" + next "on the sea floor" dex -_CharmanderDexEntry:: - text "Obviously prefers" - next "hot places. When" - next "it rains, steam" +_KabutopsDexEntry:: + text "A slim and fast" + next "swimmer. It slices" + next "its prey with its" - page "is said to spout" - next "from the tip of" - next "its tail" + page "sharp sickles and" + next "drinks the body" + next "fluids" dex -_SquirtleDexEntry:: - text "After birth, its" - next "back swells and" - next "hardens into a" +_AerodactylDexEntry:: + text "A savage #MON" + next "that died out in" + next "ancient times. It" - page "shell. Powerfully" - next "sprays foam from" - next "its mouth" + page "was resurrected" + next "using DNA taken" + next "from amber" dex -_CharmeleonDexEntry:: - text "When it swings" - next "its burning tail," - next "it elevates the" +_SnorlaxDexEntry:: + text "Will eat anything," + next "even if the food" + next "happens to be a" - page "temperature to" - next "unbearably high" - next "levels" + page "little moldy. It" + next "never gets an" + next "upset stomach" dex -_WartortleDexEntry:: - text "Often hides in" - next "water to stalk" - next "unwary prey. For" +_ArticunoDexEntry:: + text "A legendary bird" + next "#MON. It" + next "freezes water" - page "swimming fast, it" - next "moves its ears to" - next "maintain balance" + page "that is contained" + next "in winter air and" + next "makes it snow" dex -_CharizardDexEntry:: - text "Spits fire that" - next "is hot enough to" - next "melt boulders." +_ZapdosDexEntry:: + text "This legendary" + next "bird #MON is" + next "said to appear" - page "Known to cause" - next "forest fires" - next "unintentionally" + page "when the sky turns" + next "dark and lightning" + next "showers down" dex -_OddishDexEntry:: - text "During the day," - next "it keeps its face" - next "buried in the" +_MoltresDexEntry:: + text "A legendary bird" + next "#MON. As it" + next "flaps its flaming" - page "ground. At night," - next "it wanders around" - next "sowing its seeds" + page "wings, even the" + next "night sky will" + next "turn red" dex -_GloomDexEntry:: - text "The fluid that" - next "oozes from its" - next "mouth isn't drool." +_DratiniDexEntry:: + text "The existence of" + next "this mythical" + next "#MON was only" - page "It is a nectar" - next "that is used to" - next "attract prey" + page "recently confirmed" + next "by a fisherman" + next "who caught one" dex -_VileplumeDexEntry:: - text "The larger its" - next "petals, the more" - next "toxic pollen it" +_DragonairDexEntry:: + text "According to a" + next "witness, its body" + next "was surrounded by" - page "contains. Its big" - next "head is heavy and" - next "hard to hold up" + page "a strange aura" + next "that gave it a" + next "mystical look" dex -_BellsproutDexEntry:: - text "A carnivorous" - next "#MON that traps" - next "and eats bugs." +_DragoniteDexEntry:: + text "It is said that" + next "this #MON lives" + next "somewhere in the" - page "It uses its root" - next "feet to soak up" - next "needed moisture" + page "sea and that it" + next "flies. However, it" + next "is only a rumor" dex -_WeepinbellDexEntry:: - text "It spits out" - next "POISONPOWDER to" - next "immobilize the" +_MewtwoDexEntry:: + text "Its DNA is almost" + next "the same as MEW's." + next "However, its size" - page "enemy and then" - next "finishes it with" - next "a spray of ACID" + page "and disposition" + next "are vastly dif-" + next "ferent" dex -_VictreebelDexEntry:: - text "Said to live in" - next "huge colonies" - next "deep in jungles," +_MewDexEntry:: + text "When viewed" + next "through a micro-" + next "scope, this" - page "although no one" - next "has ever returned" - next "from there" + page "#MON's short," + next "fine, delicate" + next "hair can be seen" dex diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 51f6b244..19016d14 100755 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -222,11 +222,11 @@ NidoranMEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 21, FOCUS_ENERGY - db 29, FURY_ATTACK - db 36, HORN_DRILL - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, FOCUS_ENERGY + db 30, FURY_ATTACK + db 38, HORN_DRILL db 0 ClefairyEvosMoves: @@ -271,7 +271,7 @@ NidokingEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING + db 12, DOUBLE_KICK db 23, THRASH db 0 @@ -360,11 +360,11 @@ NidoranFEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 21, TAIL_WHIP - db 29, BITE - db 36, FURY_SWIPES - db 43, DOUBLE_KICK + db 12, DOUBLE_KICK + db 17, POISON_STING + db 23, TAIL_WHIP + db 30, BITE + db 38, FURY_SWIPES db 0 NidoqueenEvosMoves: @@ -372,7 +372,7 @@ NidoqueenEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING + db 12, DOUBLE_KICK db 23, BODY_SLAM db 0 @@ -381,6 +381,9 @@ CuboneEvosMoves: db EV_LEVEL, 28, MAROWAK db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 31, FOCUS_ENERGY db 38, THRASH @@ -486,6 +489,7 @@ ScytherEvosMoves: db 29, SLASH db 35, SWORDS_DANCE db 42, AGILITY + db 50, WING_ATTACK db 0 StaryuEvosMoves: @@ -518,6 +522,7 @@ PinsirEvosMoves: ; Evolutions db 0 ; Learnset + db 21, BIND db 25, SEISMIC_TOSS db 30, GUILLOTINE db 36, FOCUS_ENERGY @@ -530,12 +535,14 @@ TangelaEvosMoves: ; Evolutions db 0 ; Learnset - db 29, ABSORB + db 24, BIND + db 27, ABSORB + db 29, VINE_WHIP db 32, POISONPOWDER db 36, STUN_SPORE db 39, SLEEP_POWDER db 45, SLAM - db 49, GROWTH + db 48, GROWTH db 0 MissingNo1FEvosMoves: @@ -640,6 +647,7 @@ ChanseyEvosMoves: ; Evolutions db 0 ; Learnset + db 12, DOUBLESLAP db 24, SING db 30, GROWL db 38, MINIMIZE @@ -822,11 +830,13 @@ MankeyEvosMoves: db EV_LEVEL, 28, PRIMEAPE db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY db 33, SEISMIC_TOSS db 39, THRASH + db 45, SCREECH db 0 SeelEvosMoves: @@ -898,7 +908,9 @@ VenonatEvosMoves: db EV_LEVEL, 31, VENOMOTH db 0 ; Learnset - db 24, POISONPOWDER + db 11, SUPERSONIC + db 19, CONFUSION + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 35, PSYBEAM @@ -1071,11 +1083,15 @@ PikachuEvosMoves: db EV_ITEM, THUNDER_STONE, 1, RAICHU db 0 ; Learnset - db 9, THUNDER_WAVE - db 16, QUICK_ATTACK - db 26, SWIFT + db 6, TAIL_WHIP + db 8, THUNDER_WAVE + db 11, QUICK_ATTACK + db 15, DOUBLE_TEAM + db 20, SLAM + db 26, THUNDERBOLT db 33, AGILITY - db 43, THUNDER + db 41, THUNDER + db 50, LIGHT_SCREEN db 0 RaichuEvosMoves: @@ -1247,52 +1263,55 @@ EeveeEvosMoves: db EV_ITEM, WATER_STONE, 1, VAPOREON db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, TAIL_WHIP - db 37, BITE - db 45, TAKE_DOWN + db 8, SAND_ATTACK + db 16, GROWL + db 23, QUICK_ATTACK + db 30, BITE + db 36, FOCUS_ENERGY + db 42, TAKE_DOWN db 0 FlareonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, EMBER - db 37, TAIL_WHIP - db 40, BITE - db 42, LEER - db 44, FIRE_SPIN - db 48, RAGE - db 54, FLAMETHROWER + db 8, SAND_ATTACK + db 16, EMBER + db 23, QUICK_ATTACK + db 30, BITE + db 36, FIRE_SPIN + db 42, SMOG + db 47, LEER + db 52, FLAMETHROWER db 0 JolteonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, THUNDERSHOCK - db 37, TAIL_WHIP - db 40, THUNDER_WAVE - db 42, DOUBLE_KICK - db 44, AGILITY - db 48, PIN_MISSILE - db 54, THUNDER + db 8, SAND_ATTACK + db 16, THUNDERSHOCK + db 23, QUICK_ATTACK + db 30, DOUBLE_KICK + db 36, PIN_MISSILE + db 42, THUNDER_WAVE + db 47, AGILITY + db 52, THUNDER db 0 VaporeonEvosMoves: ; Evolutions db 0 ; Learnset - db 27, QUICK_ATTACK - db 31, WATER_GUN - db 37, TAIL_WHIP - db 40, BITE - db 42, ACID_ARMOR - db 44, HAZE - db 48, MIST - db 54, HYDRO_PUMP + db 8, SAND_ATTACK + db 16, WATER_GUN + db 23, QUICK_ATTACK + db 30, BITE + db 36, AURORA_BEAM + db 42, HAZE + db 42, MIST + db 47, ACID_ARMOR + db 52, HYDRO_PUMP db 0 MachopEvosMoves: @@ -1412,11 +1431,14 @@ PrimeapeEvosMoves: ; Evolutions db 0 ; Learnset + db 9, LOW_KICK db 15, KARATE_CHOP db 21, FURY_SWIPES db 27, FOCUS_ENERGY + db 28, RAGE db 37, SEISMIC_TOSS db 46, THRASH + db 45, SCREECH db 0 DugtrioEvosMoves: @@ -1434,7 +1456,7 @@ VenomothEvosMoves: ; Evolutions db 0 ; Learnset - db 24, POISONPOWDER + db 22, POISONPOWDER db 27, LEECH_LIFE db 30, STUN_SPORE db 38, PSYBEAM @@ -1477,19 +1499,21 @@ MetapodEvosMoves: db EV_LEVEL, 10, BUTTERFREE db 0 ; Learnset + db 7, HARDEN db 0 ButterfreeEvosMoves: ; Evolutions db 0 ; Learnset - db 12, CONFUSION - db 15, POISONPOWDER - db 16, STUN_SPORE - db 17, SLEEP_POWDER - db 21, SUPERSONIC - db 26, WHIRLWIND - db 32, PSYBEAM + db 10, CONFUSION + db 13, POISONPOWDER + db 14, STUN_SPORE + db 15, SLEEP_POWDER + db 18, SUPERSONIC + db 23, WHIRLWIND + db 28, GUST + db 34, PSYBEAM db 0 MachampEvosMoves: @@ -1669,6 +1693,9 @@ MarowakEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 33, FOCUS_ENERGY db 41, THRASH @@ -1889,11 +1916,11 @@ NidorinoEvosMoves: db 0 ; Learnset db 8, HORN_ATTACK - db 14, POISON_STING - db 23, FOCUS_ENERGY - db 32, FURY_ATTACK - db 41, HORN_DRILL - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, FOCUS_ENERGY + db 36, FURY_ATTACK + db 46, HORN_DRILL db 0 NidorinaEvosMoves: @@ -1902,11 +1929,11 @@ NidorinaEvosMoves: db 0 ; Learnset db 8, SCRATCH - db 14, POISON_STING - db 23, TAIL_WHIP - db 32, BITE - db 41, FURY_SWIPES - db 50, DOUBLE_KICK + db 12, DOUBLE_KICK + db 19, POISON_STING + db 27, TAIL_WHIP + db 36, BITE + db 46, FURY_SWIPES db 0 GeodudeEvosMoves: diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 471ee846..0fbc9260 100755 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -11,7 +11,7 @@ MonPartyData: dn ICON_QUADRUPED, ICON_QUADRUPED ; Rattata / Raticate dn ICON_BIRD, ICON_BIRD ; Spearow / Fearow dn ICON_SNAKE, ICON_SNAKE ; Ekans / Arbok - dn ICON_FAIRY, ICON_FAIRY ; Pikachu / Raichu + dn ICON_PIKACHU, ICON_PIKACHU ; Pikachu / Raichu dn ICON_MON, ICON_MON ; Sandshrew / Sandslash dn ICON_MON, ICON_MON ; NidoranF / Nidorina dn ICON_MON, ICON_MON ; Nidoqueen / NidoranM diff --git a/data/pokemon/mew.asm b/data/pokemon/mew.asm deleted file mode 100644 index c68867ee..00000000 --- a/data/pokemon/mew.asm +++ /dev/null @@ -1,15 +0,0 @@ -; Mew's pics and base data are not grouped with the other Pokémon -; because it was a last-minute addition "as a kind of prank". -; Shigeki Morimoto explained in an Iwata Asks interview: -; "We put Mew in right at the very end. The cartridge was really full and -; there wasn't room for much more on there. Then the debug features which -; weren't going to be included in the final version of the game were removed, -; creating a miniscule 300 bytes of free space. So we thought that we could -; slot Mew in there. What we did would be unthinkable nowadays!" -; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0 - -MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" -MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" - -MewBaseStats:: -INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm deleted file mode 100755 index c0acd13a..00000000 --- a/data/pokemon/title_mons.asm +++ /dev/null @@ -1,56 +0,0 @@ -TitleMons: -; mons on the title screen are randomly chosen from here -IF DEF(_RED) - db STARTER1 - db STARTER2 - db STARTER3 - db WEEDLE - db NIDORAN_M - db SCYTHER - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP -ENDC -IF DEF(_GREEN) - db STARTER3 - db STARTER1 - db STARTER2 - db CATERPIE - db NIDORAN_F - db PINSIR - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP -ENDC -IF DEF(_BLUE) - db STARTER2 - db STARTER1 - db STARTER3 - db MANKEY - db HITMONLEE - db VULPIX - db CHANSEY - db AERODACTYL - db JOLTEON - db SNORLAX - db GLOOM - db POLIWAG - db DODUO - db PORYGON - db GENGAR - db RAICHU -ENDC |