diff options
Diffstat (limited to 'data')
153 files changed, 630 insertions, 594 deletions
diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index 80f88cc4..56dac3a5 100755 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -48,11 +48,11 @@ FirstMapSpec: special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 TradeCenterSpec1: special_warp_spec TRADE_CENTER, 3, 4, CLUB -TradeCenterSpec2: +TradeCenterSpec2: special_warp_spec TRADE_CENTER, 6, 4, CLUB -ColosseumSpec1: +ColosseumSpec1: special_warp_spec COLOSSEUM, 3, 4, CLUB -ColosseumSpec2: +ColosseumSpec2: special_warp_spec COLOSSEUM, 6, 4, CLUB diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 54c9a9c9..3c69c7c7 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_yellow/abra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 5ed73b3e..aad1aff5 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_yellow/aerodactyl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c3e1c4cd..30bf57cc 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_yellow/alakazam.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions dw AlakazamPicFront, AlakazamPicBack 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 f981efae..c34316ce 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_yellow/arbok.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 380be0a8..d21ec31b 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_yellow/arcanine.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d53fc4fc..c40d5326 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_yellow/articuno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ac1c5757..328538a3 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_yellow/beedrill.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8b46be24..075598db 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_yellow/bellsprout.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 041db750..512c66a3 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_yellow/blastoise.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 a20d2744..e2796f9e 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_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ca480b58..56f64df8 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_yellow/butterfree.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack db CONFUSION, NO_MOVE, 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, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index 1f048547..e9c196ab 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_yellow/caterpie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 81da1513..0d673e2b 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_yellow/chansey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions dw ChanseyPicFront, ChanseyPicBack 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 7154f472..6ecf64d4 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 209 ; base exp - INCBIN "gfx/pokemon/front_yellow/charizard.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, \ + 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 diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 4e3a7f59..acf364ed 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_yellow/charmander.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 e85ef0de..0305197e 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_yellow/charmeleon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c01ac2e6..0aef8405 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_yellow/clefable.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 a00ccafe..136b30be 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_yellow/clefairy.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 eb691a50..8b75cb0e 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_yellow/cloyster.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 53224fb8..fc155047 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_yellow/cubone.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions dw CubonePicFront, CubonePicBack 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 7bb63662..822189a9 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_yellow/dewgong.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 76721d69..46780291 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -7,14 +7,14 @@ db 255 ; catch rate db 81 ; base exp - INCBIN "gfx/pokemon/front_yellow/diglett.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index a8a175ec..a3d919f4 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_yellow/ditto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 481c021b..a3e95545 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_yellow/dodrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 af9e2cf7..9803960b 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_yellow/doduo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c50c8e74..b95254f2 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -7,7 +7,7 @@ db 27 ; catch rate db 144 ; base exp - INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ff4aa45a..d84adc2f 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -7,18 +7,18 @@ db 9 ; catch rate db 218 ; base exp - INCBIN "gfx/pokemon/front_yellow/dragonite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 28ac755b..42a93822 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_yellow/dratini.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 0c71b320..047b9f8e 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_yellow/drowzee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 e29c120b..94e733e9 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -7,16 +7,16 @@ db 50 ; catch rate db 153 ; base exp - INCBIN "gfx/pokemon/front_yellow/dugtrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index add50a6d..6919285d 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_yellow/eevee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions dw EeveePicFront, EeveePicBack 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 0b6a8945..878d223f 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_yellow/ekans.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 dfd153bb..8378cc52 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_yellow/electabuzz.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ae2e6cf4..59f21767 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_yellow/electrode.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 418c3948..8eea9e3a 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_yellow/exeggcute.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 236d706e..cb4d3ee6 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_yellow/exeggutor.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d608b3fb..8e0d79e4 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_yellow/farfetchd.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 afb89921..33ad5c5a 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_yellow/fearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 0a714783..2aa8f507 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_yellow/flareon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions dw FlareonPicFront, FlareonPicBack 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 fc8c86ef..f48b4234 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_yellow/gastly.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 dc9105c6..3a07a441 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_yellow/gengar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 a2225f5c..849e1234 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_yellow/geodude.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8c24985c..7526d5ef 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_yellow/gloom.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 6eb60490..9c852c91 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_yellow/golbat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 662c6c93..35ea2418 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_yellow/goldeen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 b7c035c6..eb79d100 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_yellow/golduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 a8f5cbf9..adcefb3f 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_yellow/golem.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d5dfda81..af0b3dcc 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_yellow/graveler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 b2e0f08a..24e972ce 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_yellow/grimer.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 2c70184f..efc1059f 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_yellow/growlithe.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 13c30ff8..62dd980f 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_yellow/gyarados.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions dw GyaradosPicFront, GyaradosPicBack 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 cf9df9ec..71e94347 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_yellow/haunter.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 1b7651ff..407e5e32 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_yellow/hitmonchan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 51da5f75..e39ceecd 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_yellow/hitmonlee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 1a5a5aff..9520ad59 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_yellow/horsea.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 b43cd961..760276db 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_yellow/hypno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 3d69a8d7..3601a924 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_yellow/ivysaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8348431d..c249d93d 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_yellow/jigglypuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 3db8c96a..a4b74759 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_yellow/jolteon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions dw JolteonPicFront, JolteonPicBack 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 f4fe28c7..1700c890 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_yellow/jynx.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d5d96d1f..407c78f5 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_yellow/kabuto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 f067949e..e3a6d44f 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 201 ; base exp - INCBIN "gfx/pokemon/front_yellow/kabutops.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, \ + 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 diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 30d2feef..77fbf556 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_yellow/kadabra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions dw KadabraPicFront, KadabraPicBack 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 39870dc4..c0cfb63c 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_yellow/kakuna.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 7d3cf971..ccd36041 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_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c0d75d62..d3b3b80e 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_yellow/kingler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 5b63ebc8..b9b63812 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_yellow/koffing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 dd0f739a..6bd1c197 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_yellow/krabby.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 eb45e08c..5e31f7f5 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_yellow/lapras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 eef13946..45826b40 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_yellow/lickitung.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 e00ccea6..f750f9fa 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_yellow/machamp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 0e1a1d46..b52772ef 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_yellow/machoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 3c7b8491..20fe0e6e 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_yellow/machop.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8d7eef46..c2c2f8c2 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_yellow/magikarp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 1619e211..b402cfa3 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_yellow/magmar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 cb249496..6242d692 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_yellow/magnemite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 36db2428..13d2e595 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_yellow/magneton.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 cb60435b..ea529243 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_yellow/mankey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 bdd1636e..ee2b778f 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_yellow/marowak.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions dw MarowakPicFront, MarowakPicBack 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 9b06043b..31a59bd5 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_yellow/meowth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 5d3d1740..e20b08bf 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_yellow/metapod.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 caa7fb85..c7f268a2 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -7,23 +7,23 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front_yellow/mew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, \ + 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 diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 99ff53fe..5d76160f 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -7,19 +7,19 @@ db 3 ; catch rate db 220 ; base exp - INCBIN "gfx/pokemon/front_yellow/mewtwo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, 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, \ + 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 diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 50b23fd8..58745a29 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_yellow/moltres.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 e6cdba21..20c96508 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_yellow/mr.mime.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 42885050..901421ec 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_yellow/muk.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 602ed2ff..2e0d4177 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_yellow/nidoking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 5fba3fed..9b249f98 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_yellow/nidoqueen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 814e2dd7..8ba4316c 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_yellow/nidoranf.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 05b3050a..2b412640 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_yellow/nidoranm.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9831db3e..4345aeb7 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_yellow/nidorina.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d8abd036..44a11559 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_yellow/nidorino.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 7373d2e9..2c2bc615 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_yellow/ninetales.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 de1498b9..60172ea4 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_yellow/oddish.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 1dff5d20..258b2706 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_yellow/omanyte.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 1deaf789..8ba4113e 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_yellow/omastar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 96048ee5..29d2f677 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_yellow/onix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 82e9920e..0a36e229 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_yellow/paras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 bcd47673..5fa09fc9 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_yellow/parasect.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 4da05861..ec214ead 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_yellow/persian.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 b4370201..9be82174 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_yellow/pidgeot.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c44325db..2b99e4a6 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_yellow/pidgeotto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 0c1c241b..04d23804 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_yellow/pidgey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8bef5f8b..4a7f5e80 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_yellow/pikachu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 e67a2896..946feaf1 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_yellow/pinsir.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 04f0aae5..f13b4c85 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_yellow/poliwag.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 54673b74..8055d5ff 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_yellow/poliwhirl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 2c3b6bc5..cd89c1ed 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_yellow/poliwrath.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ee8e3389..71d51956 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_yellow/ponyta.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8be8923e..bfec59ef 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_yellow/porygon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 57f6e901..6d533b28 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_yellow/primeape.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions dw PrimeapePicFront, PrimeapePicBack 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 1f6c4437..b3fb9f41 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_yellow/psyduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9ac93813..a5c5acea 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_yellow/raichu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8a093859..dbe16ab0 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_yellow/rapidash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9dc46afb..b33adf4d 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_yellow/raticate.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9cace629..d6e263a1 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_yellow/rattata.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 f08f7255..c6b17500 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_yellow/rhydon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 3b8b1eb4..6f4bb31b 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_yellow/rhyhorn.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 aa107190..a05f516f 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_yellow/sandshrew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9c51bbba..5a50dd25 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_yellow/sandslash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 de73eea4..044a2baf 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_yellow/scyther.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 89ab670f..6e3fb7ef 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_yellow/seadra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 bcb0dd64..532a4c70 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_yellow/seaking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 eba3d34d..e2fe02ec 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_yellow/seel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 ed8cc154..b52f7cb4 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_yellow/shellder.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 33f02f22..77483e91 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_yellow/slowbro.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 32eb6aa9..0ae2ef0a 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_yellow/slowpoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 f835a4b9..9b6ccd3e 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_yellow/snorlax.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 c353fc89..161f4100 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_yellow/spearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 11db64ac..e844ac6e 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_yellow/squirtle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 6f9681a2..1ec43ca8 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_yellow/starmie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 08b1250b..198f552f 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_yellow/staryu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 bb0bafd1..8ab7d548 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 166 ; base exp - INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions dw TangelaPicFront, TangelaPicBack db CONSTRICT, 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, 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 311eecad..9aba3e22 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_yellow/tauros.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 7f128c3f..e8296d61 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_yellow/tentacool.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 eeea2d0f..ad8f773e 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_yellow/tentacruel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 bc800fea..5c45b173 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_yellow/vaporeon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions dw VaporeonPicFront, VaporeonPicBack 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 85c1de76..ff4295d0 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 138 ; base exp - INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions dw VenomothPicFront, VenomothPicBack db TACKLE, DISABLE, SUPERSONIC, CONFUSION ; level 1 learnset @@ -15,8 +15,8 @@ ; 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, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 47590f61..49ee0b97 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 75 ; base exp - INCBIN "gfx/pokemon/front_yellow/venonat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ + SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index d97b9c64..414590d8 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_yellow/venusaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 8fd9c2f9..5b958297 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_yellow/victreebel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 d6baddb9..10ae05da 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_yellow/vileplume.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 6234d3a4..4ad65701 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_yellow/voltorb.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 7aba033e..c112b97d 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_yellow/vulpix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 df4c7314..d430bcdc 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_yellow/wartortle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 67769f3b..f6aba236 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_yellow/weedle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 90a3dc49..513de8f8 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_yellow/weepinbell.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 f5618bb0..d605f15a 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_yellow/weezing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 2a6876b2..7249badf 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_yellow/wigglytuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 68b6396a..6571d286 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_yellow/zapdos.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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 9e4fa80f..ddae33cb 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_yellow/zubat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/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/unknown_list.asm b/data/pokemon/unknown_list.asm new file mode 100644 index 00000000..010d415b --- /dev/null +++ b/data/pokemon/unknown_list.asm @@ -0,0 +1,36 @@ +; This list is used by a unreferenced function. + +Pointer_3b0ee: + db NIDOKING + db IVYSAUR + db EXEGGUTOR + db GENGAR + db NIDOQUEEN + db ARCANINE + db GYARADOS + db BLASTOISE + db GOLEM + db DRAGONITE + db NINETALES + db DRAGONAIR + db KABUTOPS + db OMASTAR + db JIGGLYPUFF + db FLAREON + db JOLTEON + db VAPOREON + db BEEDRILL + db BUTTERFREE + db MACHAMP + db CLOYSTER + db CLEFABLE + db ALAKAZAM + db STARMIE + db VENUSAUR + db TENTACRUEL + db CHARMELEON + db WARTORTLE + db CHARIZARD + db VILEPLUME + db VICTREEBEL + db -1 ; end |