diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 3076d948..7bd55358 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions dw ArcaninePicFront, ArcaninePicBack - db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset + db FIRE_BLAST, HYPER_BEAM, BODY_SLAM, DIG ; level 1 learnset - used for trainers db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 385568f3..e9c4c3df 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions dw BellossomPicFront, BellossomPicBack - db SLEEP_POWDER, ABSORB, ACID, PETAL_DANCE ; level 1 learnset + db SLEEP_POWDER, STUN_SPORE, BODY_SLAM, PETAL_DANCE ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 5a1df5c2..1325f951 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions dw ClefablePicFront, ClefablePicBack - db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset + db THUNDER_WAVE, BODY_SLAM, BLIZZARD, THUNDERBOLT ; level 1 learnset - used for trainers db GROWTH_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index b57cc892..bfbe1c3e 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions dw CloysterPicFront, CloysterPicBack - db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset + db EXPLOSION, SURF, CLAMP, BLIZZARD ; level 1 learnset - used for trainers db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 2c4fe11e..c2b48ad5 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions dw ExeggutorPicFront, ExeggutorPicBack - db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset + db SLEEP_POWDER, STUN_SPORE, PSYCHIC_M, EXPLOSION ; level 1 learnset - used for trainers db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/leafeon.asm b/data/pokemon/base_stats/leafeon.asm index d5f3178e..97689a2f 100644 --- a/data/pokemon/base_stats/leafeon.asm +++ b/data/pokemon/base_stats/leafeon.asm @@ -14,7 +14,7 @@ db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + tmhm TOXIC, BODY_SLAM, SWORDS_DANCE, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE diff --git a/data/pokemon/base_stats/magnezone.asm b/data/pokemon/base_stats/magnezone.asm index 14d91d04..bc360c4f 100644 --- a/data/pokemon/base_stats/magnezone.asm +++ b/data/pokemon/base_stats/magnezone.asm @@ -3,7 +3,7 @@ db 50, 60, 95, 70, 120 ; hp atk def spd spc - db ELECTRIC, ELECTRIC ; type + db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index e0094618..05bc07a9 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack - db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset + db EARTHQUAKE, BODY_SLAM, BLIZZARD, THUNDERBOLT ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index bfb912a3..54256159 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions dw NidoqueenPicFront, NidoqueenPicBack - db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset + db EARTHQUAKE, ROCK_SLIDE, SURF, BLIZZARD ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoreign.asm b/data/pokemon/base_stats/nidoreign.asm index f527c2d1..71ac6970 100644 --- a/data/pokemon/base_stats/nidoreign.asm +++ b/data/pokemon/base_stats/nidoreign.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions dw NidoreignPicFront, NidoreignPicBack - db SCRATCH, GROWL, TAIL_WHIP, BITE ; level 1 learnset + db BODY_SLAM, ROCK_SLIDE, THUNDERBOLT, BLIZZARD ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index af04230b..6847f1ad 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions dw NinetalesPicFront, NinetalesPicBack - db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset + db FIRE_SPIN, FIRE_BLAST, CONFUSE_RAY, BODY_SLAM ; level 1 learnset - used for trainers db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index d799ad8c..f59ef055 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions dw PolitoedPicFront, PolitoedPicBack - db HYPNOSIS, WATER_GUN, BUBBLE, NO_MOVE ; level 1 learnset + db HYPNOSIS, AMNESIA, SURF, BODY_SLAM ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/tsubomitto.asm b/data/pokemon/base_stats/tsubomitto.asm index b8d6329f..bc353c7c 100644 --- a/data/pokemon/base_stats/tsubomitto.asm +++ b/data/pokemon/base_stats/tsubomitto.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/tsubomitto.pic", 0, 1 ; sprite dimensions dw TsubomittoPicFront, TsubomittoPicBack - db VINE_WHIP, GROWTH, LOVELY_KISS, RAZOR_LEAF ; level 1 learnset + db RAZOR_LEAF, SWORDS_DANCE, LOVELY_KISS, HYPER_BEAM ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index dc703c90..360f3e1a 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions dw VileplumePicFront, VileplumePicBack - db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset + db STUN_SPORE, SLEEP_POWDER, BODY_SLAM, PETAL_DANCE ; level 1 learnset - used for trainers db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 65e70844..e839d29c 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions dw WigglytuffPicFront, WigglytuffPicBack - db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset + db SING, BODY_SLAM, HYPER_BEAM, BUBBLEBEAM ; level 1 learnset - used for trainers db GROWTH_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index b4e3b0f8..023f0b0a 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2627,6 +2627,7 @@ TsubomittoEvosMoves: ; Evolutions db 0 ; Learnset + db 40, LOVELY_KISS db 48, SOLARBEAM db 0 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 01ead861..eb12fa9e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -719,10 +719,10 @@ ChannelerData: db 23, GASTLY, GASTLY, 0 db 24, GASTLY, 0 ; Pokémon Tower 3F - db 23, MIKON, GASTLY 0 + db 23, MIKON, GASTLY, 0 db 24, VULPIX, 0 -; Unused - db 24, HAUNTER, 0 +; Unused - this will be used in the Silph Gauntlet + db 65, MAROWAK, NINETALES, GUARDIA, BARUNDA, MUK, GENGAR, 0 ; Pokémon Tower 3F db 25, GASTLY, HAUNTER, 0 ; Pokémon Tower 4F, now unused