diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index ea503a20..34a3ab67 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -68,7 +68,7 @@ DEF MAX_STAT_VALUE EQU 999 ; trainer dvs, these should be set to 15. DEF ATKDEFDV_TRAINER EQU $FF -DEF SPDSPCDV_TRAINER EQU $FF +DEF SPDSPCDV_TRAINER EQU $FF ; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags const_def diff --git a/data/pokemon/base_stats/kleavor.asm b/data/pokemon/base_stats/kleavor.asm index b1cc9000..250caa24 100644 --- a/data/pokemon/base_stats/kleavor.asm +++ b/data/pokemon/base_stats/kleavor.asm @@ -1,9 +1,9 @@ db DEX_KLEAVOR ; pokedex id - db 70, 110, 80, 105, 55 + db 70, 135, 95, 85, 45 ; hp atk def spd spc - db BUG, FLYING ; type + db BUG, ROCK ; type db 45 ; catch rate db 187 ; base exp @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ - SKULL_BASH, REST, SUBSTITUTE, CUT + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT ; end db BANK(ScytherPicFront) diff --git a/data/pokemon/base_stats/lickilicky.asm b/data/pokemon/base_stats/lickilicky.asm index f72b5b84..4e97841f 100644 --- a/data/pokemon/base_stats/lickilicky.asm +++ b/data/pokemon/base_stats/lickilicky.asm @@ -1,6 +1,6 @@ db DEX_LICKILICKY ; pokedex id - db 90, 55, 75, 30, 60 + db 110, 85, 55, 50, 80 ; hp atk def spd spc db NORMAL, NORMAL ; type diff --git a/data/pokemon/base_stats/tangrowth.asm b/data/pokemon/base_stats/tangrowth.asm index 0cb5136a..5c7d38c5 100644 --- a/data/pokemon/base_stats/tangrowth.asm +++ b/data/pokemon/base_stats/tangrowth.asm @@ -1,6 +1,6 @@ db DEX_TANGROWTH ; pokedex id - db 65, 55, 115, 60, 100 + db 100, 100, 125, 50, 110 ; hp atk def spd spc db GRASS, GRASS ; type @@ -14,10 +14,11 @@ db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ - CUT + tmhm MEGA_PUNCH, SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MEGA_DRAIN, SOLARBEAM, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, CUT ; end db BANK(TangelaPicFront) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 921bf07d..e81f416b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6150,9 +6150,10 @@ LoadEnemyMonData: ld b, SPDSPCDV_TRAINER jr z, .storeDVs ; random DVs for wild mon - ld a, ATKDEFDV_TRAINER - ld b, SPDSPCDV_TRAINER - jr z, .storeDVs + call BattleRandom + ld b, a + call BattleRandom +.storeDVs ld hl, wEnemyMonDVs ld [hli], a ld [hl], b