From 487459cf138d1bb69b72f0f938c50e9755c90b58 Mon Sep 17 00:00:00 2001 From: StarBeasts Date: Wed, 12 Jun 2024 17:07:18 -0400 Subject: [PATCH] updated stats for new mons --- Beast Information & Locations - Spoilers.txt | 78 +++++++++++--------- data/pokemon/base_stats/kabuto.asm | 18 ++--- data/pokemon/base_stats/kabutops.asm | 18 ++--- data/pokemon/evos_moves.asm | 17 +++-- data/trainers/parties.asm | 4 +- data/wild/grass_water.asm | 2 - 6 files changed, 71 insertions(+), 66 deletions(-) diff --git a/Beast Information & Locations - Spoilers.txt b/Beast Information & Locations - Spoilers.txt index 8ab9278a..820944df 100755 --- a/Beast Information & Locations - Spoilers.txt +++ b/Beast Information & Locations - Spoilers.txt @@ -4551,7 +4551,7 @@ Defense: 66 Special: 66 Speed: 66 -Location: Revive Fiend Soul at Cinnabar Lab Soul Room (Only one), Safari Zone, Nature Preserve +Location: Revive Fiend Soul at Cinnabar Lab Soul Room (Only one), Cracture Chasm (Only one, if you chose Angel Soul), Safari Zone, Nature Preserve Starting Moves: BITE, WING_ATTACK, EMBER, POISON_FANG @@ -4611,7 +4611,7 @@ REFLECT, BIDE, METRONOME, SELFDESTRUCT, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, CUT, FLY, STRENGTH, FLASH -#140 - Gerbird +#140 - Niviah Flying @@ -4621,57 +4621,63 @@ Defense: 77 Special: 77 Speed: 77 -Location: Revive Angel Soul at Cinnabar Lab Soul Room (Only one), Safari Zone, Nature Preserve +Location: Revive Angel Soul at Cinnabar Lab Soul Room (Only one), Cracture Chasm (Only one, if you chose Fiend Soul), Safari Zone, Nature Preserve Starting Moves: -WING_ATTACK, ROLLING_KICK, OMINOUS_WIND, GLARE +POWDER_SNOW, WING_ATTACK, OMINOUS_WIND, GLARE Learnset -34, DRILL_PECK -39, METAL_CLAW -44, DRILL_RUN -49, SUBMISSION +34, RECOVER +39, LOVELY_KISS +44, DOUBLE_EDGE +49, PK_STARSTORM TM / HM -FALCON_PUNCH, HURRICANE, SWORDS_DANCE, DRAGON_CLAW, -TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, -PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, -SHADOW_CLAW, DRAGONBREATH, EARTHQUAKE, FISSURE, -DIG, MIMIC, DOUBLE_TEAM, BIDE, METRONOME, -EGG_BOMB, SWIFT, SKULL_BASH, SOFTBOILED, -SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, +FALCON_PUNCH, HURRICANE, SWORDS_DANCE, FLASH_CANNON, +DRAGON_CLAW, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, +BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD,PAY_DAY, +SUBMISSION, COUNTER, SEISMIC_TOSS, SHADOW_CLAW, +MEGA_DRAIN, SOLARBEAM, DRAGONBREATH, THUNDERBOLT, THUNDER, +EARTHQUAKE, FISSURE, DIG, PSYCHIC, TELEPORT, +MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, +FIRE_BLAST, SWIFT, SKULL_BASH, +DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, + PSYWAVE, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, CUT, FLY, STRENGTH, FLASH -#141 - Knytflight +#141 - Pheras -Flying / Fighting +Flying -HP: 77 -Attack: 140 -Defense: 77 -Special: 77 -Speed: 105 +HP: 93 +Attack: 132 +Defense: 93 +Special: 93 +Speed: 93 -Location: Evolve Gerbird at Level 40 +Location: Evolve Niviah at Level 40 Starting Moves: -FALCON_PUNCH, JUMP_KICK, METAL_CLAW, GLARE +GLARE, WING_ATTACK, OMINOUS_WIND, RECOVER Learnset -34, DRILL_PECK -40, FALCON_PUNCH -46, DRILL_RUN -53, SUBMISSION +34, RECOVER +40, HYPER_VOICE +44, AURA_SPHERE +46, DOUBLE_EDGE +53, PK_STARSTORM TM / HM -FALCON_PUNCH, HURRICANE, SWORDS_DANCE, DRAGON_CLAW, -TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, -HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, -SEISMIC_TOSS, SHADOW_CLAW, DRAGONBREATH, EARTHQUAKE, -FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, METRONOME, -EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, -SOFTBOILED, SKY_ATTACK, REST, THUNDER_WAVE, -ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, +FALCON_PUNCH, HURRICANE, SWORDS_DANCE, FLASH_CANNON, +DRAGON_CLAW, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, SHADOW_CLAW, +MEGA_DRAIN, SOLARBEAM, DRAGONBREATH, THUNDERBOLT, THUNDER, +EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, +MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, +FIRE_BLAST, SWIFT, SKULL_BASH, +DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, +PSYWAVE, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, CUT, FLY, STRENGTH, FLASH #142 - Drudeer diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 5b213184..ad2b24c5 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -10,20 +10,20 @@ INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions dw KabutoPicFront, KabutoPicBack - db WING_ATTACK, ROLLING_KICK, OMINOUS_WIND, GLARE ; level 1 learnset + db POWDER_SNOW, WING_ATTACK, OMINOUS_WIND, GLARE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm FALCON_PUNCH, HURRICANE, SWORDS_DANCE, DRAGON_CLAW, \ + tmhm FALCON_PUNCH, HURRICANE, SWORDS_DANCE, FLASH_CANNON, DRAGON_CLAW, \ TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, SHADOW_CLAW, \ - DRAGONBREATH, \ - EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, \ - EGG_BOMB, SWIFT, SKULL_BASH, \ - SOFTBOILED, SKY_ATTACK, REST, \ - TRI_ATTACK, SUBSTITUTE, \ + MEGA_DRAIN, SOLARBEAM, DRAGONBREATH, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SWIFT, SKULL_BASH, \ + SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ CUT, FLY, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index 33516706..04f82017 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -10,20 +10,20 @@ INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions dw KabutopsPicFront, KabutopsPicBack - db FALCON_PUNCH, JUMP_KICK, METAL_CLAW, GLARE ; level 1 learnset + db GLARE, WING_ATTACK, OMINOUS_WIND, RECOVER ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm FALCON_PUNCH, HURRICANE, SWORDS_DANCE, DRAGON_CLAW, \ + tmhm FALCON_PUNCH, HURRICANE, SWORDS_DANCE, FLASH_CANNON, DRAGON_CLAW, \ TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, SHADOW_CLAW, \ - DRAGONBREATH, \ - EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, \ - EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ - SOFTBOILED, SKY_ATTACK, REST, THUNDER_WAVE, \ - ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ + MEGA_DRAIN, SOLARBEAM, DRAGONBREATH, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SWIFT, SKULL_BASH, \ + DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ CUT, FLY, STRENGTH, FLASH ; end diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 30fc408b..efcadc19 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1198,20 +1198,21 @@ KabutoEvosMoves: db EV_LEVEL, 40, KABUTOPS db 0 ; Learnset - db 34, DRILL_PECK - db 39, METAL_CLAW - db 44, DRILL_RUN - db 49, SUBMISSION + db 34, RECOVER + db 39, LOVELY_KISS + db 44, DOUBLE_EDGE + db 49, PK_STARSTORM db 0 KabutopsEvosMoves: ; Evolutions db 0 ; Learnset - db 34, DRILL_PECK - db 40, FALCON_PUNCH - db 46, DRILL_RUN - db 53, SUBMISSION + db 34, RECOVER + db 40, HYPER_VOICE + db 44, AURA_SPHERE + db 46, DOUBLE_EDGE + db 53, PK_STARSTORM db 0 HorseaEvosMoves: diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 081c3eb9..6bd1102b 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -676,7 +676,7 @@ BlaineData: db $FF, 42, WIGGLYTUFF, 40, ARCANINE, 42, POLIWRATH, 47, LAPRAS, 0 SabrinaData: - db $FF, 49,DUGTRIO,48,HYPNO,49,MAGNETON,51,EXEGGUTOR,52,ALAKAZAM,0 + db $FF, 49,DUGTRIO,48,KABUTOPS,49,MAGNETON,51,EXEGGUTOR,52,ALAKAZAM,0 GentlemanData: ; SS Anne 1F Rooms @@ -757,7 +757,7 @@ ChannelerData: db 35,CLEFABLE,0 db 34,MAROWAK,0 AgathaData: - db $FF, 51, OMASTAR, 51, MR_MIME, 50, HITMONLEE, 53, KOFFING, 55, GENGAR, 0 + db $FF, 51, KOFFING, 51, MR_MIME, 50, HITMONLEE, 53, OMASTAR, 55, GENGAR, 0 LanceData: db $FF, 51, GRAVELER, 52, DRAGONAIR, 52, TAUROS, 53, JOLTEON, 55, CHANSEY, 57, DRAGONITE, 0 diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 186b6be5..cdd1fba3 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -330,5 +330,3 @@ INCLUDE "data/wild/maps/VultMaze.asm" INCLUDE "data/wild/maps/AncientCave.asm" INCLUDE "data/wild/maps/DevilsCanyon.asm" - -