diff --git a/README.md b/README.md index 68e9389e..0694c957 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Improved areas QoL Enhancements ==== +- DVs are erased and replaced with perfect 15s. - PC added to Celadon Hotel where the invisible event usually is. Why not? - Artificial Save Delay has been removed. - Japanese event moves can now be taught via TM/HM; diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 2ae1cdef..ea503a20 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -66,9 +66,9 @@ DEF SLP_MASK EQU %111 ; 0-7 turns DEF MAX_STAT_VALUE EQU 999 -; trainer dvs -DEF ATKDEFDV_TRAINER EQU $98 -DEF SPDSPCDV_TRAINER EQU $88 +; trainer dvs, these should be set to 15. +DEF ATKDEFDV_TRAINER EQU $FF +DEF SPDSPCDV_TRAINER EQU $FF ; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags const_def diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 7a7291ce..921bf07d 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6150,10 +6150,9 @@ LoadEnemyMonData: ld b, SPDSPCDV_TRAINER jr z, .storeDVs ; random DVs for wild mon - call BattleRandom - ld b, a - call BattleRandom -.storeDVs + ld a, ATKDEFDV_TRAINER + ld b, SPDSPCDV_TRAINER + jr z, .storeDVs ld hl, wEnemyMonDVs ld [hli], a ld [hl], b diff --git a/ram/wram.asm b/ram/wram.asm index 1653d2db..efa35098 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2328,5 +2328,5 @@ wBoxDataEnd:: SECTION "Stack", WRAM0 ; the stack grows downward - ds $7D5 - 1 + ds $FE - 1 wStack:: db \ No newline at end of file