Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Terser damage calculation constants

Browse Source
This commit is contained in:
Rangi
2020-11-09 16:12:19 -05:00
parent 17894e5f39
commit 6a5edc98e9
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/battle_constants.asm
View File

@@ -10,10 +10,6 @@ NUM_MOVES EQU 4
BASE_STAT_LEVEL EQU 7 BASE_STAT_LEVEL EQU 7
MAX_STAT_LEVEL EQU 13 MAX_STAT_LEVEL EQU 13
; damage limits before type effectiveness
MIN_NEUTRAL_DAMAGE EQU 2
MAX_NEUTRAL_DAMAGE EQU 999
; turns that sleep lasts ; turns that sleep lasts
REST_SLEEP_TURNS EQU 2 REST_SLEEP_TURNS EQU 2
TREEMON_SLEEP_TURNS EQU 7 TREEMON_SLEEP_TURNS EQU 7

27
engine/battle/effect_commands.asm
View File

@@ -3066,8 +3066,11 @@ BattleCommand_DamageCalc:
; Critical hits ; Critical hits
call .CriticalMultiplier call .CriticalMultiplier
; Update wCurDamage. ; Update wCurDamage. Max 999 (capped at 997, then add 2).
; Capped at MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE: 999 - 2 = 997. MAX_DAMAGE EQU 999
MIN_DAMAGE EQU 2
DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
ld hl, wCurDamage ld hl, wCurDamage
ld b, [hl] ld b, [hl]
ldh a, [hQuotient + 3] ldh a, [hQuotient + 3]
@@ -3089,14 +3092,14 @@ BattleCommand_DamageCalc:
jr nz, .Cap jr nz, .Cap
ldh a, [hQuotient + 2] ldh a, [hQuotient + 2]
cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) cp HIGH(DAMAGE_CAP + 1)
jr c, .dont_cap_2 jr c, .dont_cap_2
cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + 1 cp HIGH(DAMAGE_CAP + 1) + 1
jr nc, .Cap jr nc, .Cap
ldh a, [hQuotient + 3] ldh a, [hQuotient + 3]
cp LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) cp LOW(DAMAGE_CAP + 1)
jr nc, .Cap jr nc, .Cap
.dont_cap_2 .dont_cap_2
@@ -3114,28 +3117,28 @@ BattleCommand_DamageCalc:
jr c, .Cap jr c, .Cap
ld a, [hl] ld a, [hl]
cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) cp HIGH(DAMAGE_CAP + 1)
jr c, .dont_cap_3 jr c, .dont_cap_3
cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + 1 cp HIGH(DAMAGE_CAP + 1) + 1
jr nc, .Cap jr nc, .Cap
inc hl inc hl
ld a, [hld] ld a, [hld]
cp LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) cp LOW(DAMAGE_CAP + 1)
jr c, .dont_cap_3 jr c, .dont_cap_3
.Cap: .Cap:
ld a, HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) ld a, HIGH(DAMAGE_CAP)
ld [hli], a ld [hli], a
ld a, LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) ld a, LOW(DAMAGE_CAP)
ld [hld], a ld [hld], a
.dont_cap_3 .dont_cap_3
; Add back MIN_NEUTRAL_DAMAGE (capping at 999). ; Add back MIN_DAMAGE (capping at 999).
inc hl inc hl
ld a, [hl] ld a, [hl]
add MIN_NEUTRAL_DAMAGE add MIN_DAMAGE
ld [hld], a ld [hld], a
jr nc, .dont_floor jr nc, .dont_floor
inc [hl] inc [hl]