diff options
| -rw-r--r-- | constants/battle_constants.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/add_mon.asm | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 6ae2215f..4a113ca0 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -39,6 +39,10 @@ SLP EQU %111 ; sleep counter MAX_STAT_VALUE EQU 999 +; trainer dvs +ATKDEFDV_TRAINER EQU $98 +SPDSPCDV_TRAINER EQU $88 + ; volatile statuses 1 const_def const STORING_ENERGY ; 0 ; Bide diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c1eecc73..b5c37f1e 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6104,8 +6104,8 @@ LoadEnemyMonData: ld a, [wIsInBattle] cp $2 ; is it a trainer battle? ; fixed DVs for trainer mon - ld a, $98 - ld b, $88 + ld a, ATKDEFDV_TRAINER + ld b, SPDSPCDV_TRAINER jr z, .storeDVs ; random DVs for wild mon call BattleRandom diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 0c72ff5b..d7e7eab1 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -75,8 +75,8 @@ _AddPartyMon:: push hl ld a, [wMonDataLocation] and $f - ld a, $98 ; set enemy trainer mon IVs to fixed average values - ld b, $88 + ld a, ATKDEFDV_TRAINER ; set enemy trainer mon IVs to fixed average values + ld b, SPDSPCDV_TRAINER jr nz, .next4 ; If the mon is being added to the player's party, update the pokedex. |