diff --git a/data/pokemon/base_stats/melmetal.asm b/data/pokemon/base_stats/melmetal.asm new file mode 100644 index 00000000..9431baa0 --- /dev/null +++ b/data/pokemon/base_stats/melmetal.asm @@ -0,0 +1,24 @@ + db DEX_MELMETAL ; pokedex id + + db 135, 143, 143, 34, 65 + ; hp atk def spd spc + + db STEEL, STEEL ; type + db 75 ; catch rate + db 213 ; base exp + + INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions + dw MelmetalPicFront, MelmetalPicBack + + db THUNDERSHOCK, HARDEN, THUNDER_WAVE, TAIL_WHIP ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE, \ + MEGA_PUNCH, SUBMISSION, HYPER_BEAM, MEGA_KICK, BODY_SLAM, ICE_BEAM, \ + SOLAR_BEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, ROCK_SLIDE, \ + SUBSTITUTE + ; end + + db BANK(MelmetalPicFront) + assert BANK(MelmetalPicFront) == BANK(MelmetalPicBack) \ No newline at end of file diff --git a/data/pokemon/base_stats/meltan.asm b/data/pokemon/base_stats/meltan.asm new file mode 100644 index 00000000..f790a40b --- /dev/null +++ b/data/pokemon/base_stats/meltan.asm @@ -0,0 +1,21 @@ + db DEX_MELTAN ; pokedex id + + db 46, 65, 55, 34, 35 + ; hp atk def spd spc + + db STEEL, STEEL ; type + db 75 ; catch rate + db 213 ; base exp + + INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions + dw MeltanPicFront, MeltanPicBack + + db THUNDERSHOCK, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE + ; end + + db BANK(MeltanPicFront) + assert BANK(MeltanPicFront) == BANK(MeltanPicBack) \ No newline at end of file diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index f695d2b9..82334055 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1,9 +1,6 @@ ; See constants/pokemon_data_constants.asm ; The max number of evolutions per monster is MAX_EVOLUTIONS -; db EV_ITEM, CANDY_SACK, 1, MELMETAL -; put this on Meltan when adding it - EvosMovesPointerTable: table_width 2, EvosMovesPointerTable dw RhydonEvosMoves @@ -3002,6 +2999,35 @@ MoltresGEvosMoves: db 70, SKY_ATTACK db 0 +;MeltanEvosMoves: +; Evolutions +; db EV_ITEM, CANDY_SACK, 1, MELMETAL +; Learnset +; db 8, TAIL_WHIP +; db 16, HEADBUTT +; db 24, THUNDER_WAVE +; db 32, ACID_ARMOR +; db 40, IRON_HEAD +; db 0 + +;MelmetalEvosMoves: +; Evolutions +; db 0 +; Learnset +; db 9, TAIL_WHIP +; db 16, HEADBUTT +; db 18, THUNDER_WAVE +; db 20, THUNDERPUNCH +; db 27, THUNDERSHOCK +; db 36, ACID_ARMOR +; db 45, MAGNET_BOMB +; db 51, MEGA_PUNCH +; db 63, SMART_STRIKE +; db 72, IRON_HEAD +; db 81, SUBMISSION +; db 90, HYPER_BEAM +; db 0 + MissingNoEvosMoves: ; Evolutions db 0 diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 859dfb0c..ffaae905 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -808,6 +808,26 @@ _MoltresGDexEntry:: next "wanders too close" dex +;_MeltanDexEntry:: +; text "It feeds on metal." +; next "The strongest one" +; next "in a group will" + +; page "absorb the rest" +; next "to evolve into" +; next "a MELMETAL" +; dex + +;_MelmetalDexEntry:: +; text "This #MON came" +; next "back to life" +; next "after 3,000" + +; page "years. Myths" +; next "describe it" +; next "becoming a giant" +; dex ; consider revising - include longevity and it becoming a cyclopian giant + ;_ArcanineHDexEntry:: ; text "Its body has a" ; next "rock-like feel." @@ -815,7 +835,7 @@ _MoltresGDexEntry:: ; page "its foes before" ; next "biting them in" -; next "a vicious rage." ; reference to Raging Fury, its signature move. +; next "a vicious rage" ; reference to Raging Fury, its signature move. ; dex ;_ElectrodeHDexEntry:: @@ -824,18 +844,18 @@ _MoltresGDexEntry:: ; next "a type of berry." ; page "If angered, it" -; next "electric attacks" -; next "of 20,000 volts." ; 100 kV in a bolt of lightning on average +; next "looses electricity" +; next "of 20,000 volts" ; 100 kV in a bolt of lightning on average ; dex -;_RaticateADexEntry:: +;_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries ; text "It commands nests" ; next "of RATTATA. It" ; next "will greedily" ; page "command them to" ; next "gather large" -; next "amounts of food." +; next "amounts of food" ; dex ;_SandslashADexEntry:: @@ -845,7 +865,7 @@ _MoltresGDexEntry:: ; page "by SANDSLASH" ; next "cause severe" -; next "frostbite." +; next "frostbite" ; dex ;_NinetalesADexEntry:: @@ -855,7 +875,7 @@ _MoltresGDexEntry:: ; page "presence, it" ; next "guides them away" -; next "from its home." +; next "from its home" ; dex ;_DugtrioADexEntry:: @@ -865,7 +885,7 @@ _MoltresGDexEntry:: ; page "They provide it" ; next "with protection" -; next "from attacks." +; next "from attacks" ; dex ;_PersianADexEntry:: @@ -875,7 +895,7 @@ _MoltresGDexEntry:: ; page "Despite this, it" ; next "prefers to fight" -; next "underhandedly." +; next "underhandedly" ; dex ;_GolemADexEntry:: @@ -885,7 +905,7 @@ _MoltresGDexEntry:: ; page "If it can't find" ; next "ammo, it may fire" -; next "GEODUDE instead." +; next "GEODUDE instead" ; dex ;_RapidashGDexEntry:: @@ -895,28 +915,28 @@ _MoltresGDexEntry:: ; page "If released from" ; next "its horn, it can" -; next "break concrete." +; next "break concrete" ; dex ;_SlowbroGDexEntry:: -; text "A bite from a" -; next "SHELLDER caused" -; next "a chemical" +; text "The SHELLDER that" +; next "bit SLOWBRO has" +; next "made it poisonous." -; page "reaction within" -; next "SLOWBRO, making" -; next "it POISON-type." -; dex ; consider revising +; para "SHELLDER's tongue" +; next "can be squeezed" +; next "to spit poison" +; dex ;_SlowkingGDexEntry:: -; text "Now controlled" -; next "by SHELLDER," -; next "SLOWKING will" +; text "The SHELLDER that" +; next "bit SLOWBRO has" +; next "assumed control." -; page "mumble strange" -; next "spells when" -; next "attacking." -; dex ; also consider revising +; page "Mumbling eerie" +; next "spells, it makes" +; next "strange POTIONS" +; dex ;_MukADexEntry:: ; text "Over 100 kinds" @@ -925,28 +945,78 @@ _MoltresGDexEntry:: ; page "While friendly," ; next "it must be fed" -; next "a lot of trash." +; next "a lot of trash" ; dex ;_ExeggutorADexEntry:: -; text "Stronger sunlight" +; text "While strong" +; next "sunlight has" ; next "allowed EXEGGUTOR" -; next "to reach its" -; page "true form. Its" -; next "PSI abilities" -; next "have diminished." +; page "to attain its true" +; next "form, its PSI" +; next "power has faded" ; dex ; consider revising ;_MarowakADexEntry:: -; text "The spirit of its" -; next "mother has turned" -; next "into the flames" +; text "While dancing in" +; next "mourning of its" +; next "kin, the spirit" -; page "on its bone." -; next "MAROWAK dance to" -; next "mourn their kin." -; dex ; consider revising +; page "of its mother" +; next "inhabits its" +; next "cherished bone" +; dex + +;_WeezingGDexEntry:: +; text "It is better at" +; next "taking in air" +; next "than WEEZING in" ; referencing shield kantonian weezing + +; page "KANTO. Its body" +; next "is copied when" +; next "building factories" ; referencing this: https://ibb.co/ZM2714Q - PLA takes place before RB +; dex + +;_MrMimeGDexEntry:: +; text "Instead of using" +; next "PSI energy to" +; next "make invisible," + +; page "walls, this MR." +; next "MIME makes them" +; next "using ice." +; dex + +;_TaurosPDexEntry:: +; text "Known as the" +; next "Combat Breed," +; next "this TAUROS uses" + +; page "its thick muscles" +; next "to overwhelm its" +; next "opponents." +; dex + +;_TaurosPBDexEntry:: +; text "Known as the" +; next "Blaze Breed," +; next "this TAUROS can" + +; page "expel hot air" +; next "from its nostrils" +; next "and heat its horns" +; dex + +;_TaurosPADexEntry:: +; text "Known as the" +; next "Aqua Breed," +; next "this TAUROS can" + +; page "shoot water at" +; next "high pressure from" +; next "its horns." +; dex _MissingNoDexEntry:: text "This is a newly"