reversions

This commit is contained in:
Llinos Evans 2025-07-25 17:55:22 +01:00
parent 4738656c3d
commit c1b0ec142d
9 changed files with 40 additions and 33 deletions

View file

@ -1263,6 +1263,11 @@ INCLUDE "data/battle/critical_hit_chances.asm"
INCLUDE "engine/battle/move_effects/triple_kick.asm"
GetNextTypeMatchupsByte:
ld a, BANK(TypeMatchups)
call GetFarByte
ret
BattleCommand_Stab:
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
@ -1347,7 +1352,9 @@ BattleCommand_Stab:
ld hl, TypeMatchups
.TypesLoop:
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp -1
jr z, .end
@ -1365,7 +1372,8 @@ BattleCommand_Stab:
.SkipForesightCheck:
cp b
jr nz, .SkipType
ld a, [hl]
; ld a, [hl]
call GetNextTypeMatchupsByte
cp d
jr z, .GotMatchup
cp e
@ -1470,7 +1478,9 @@ CheckTypeMatchup:
ld [wTypeMatchup], a
ld hl, TypeMatchups
.TypesLoop:
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp -1
jr z, .End
cp -2
@ -1484,7 +1494,9 @@ CheckTypeMatchup:
.Next:
cp d
jr nz, .Nope
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
cp b
jr z, .Yup
cp c
@ -1502,7 +1514,9 @@ CheckTypeMatchup:
ldh [hDividend + 0], a
ldh [hMultiplicand + 0], a
ldh [hMultiplicand + 1], a
ld a, [hli]
; ld a, [hli]
call GetNextTypeMatchupsByte
inc hl
ldh [hMultiplicand + 2], a
ld a, [wTypeMatchup]
ldh [hMultiplier], a
@ -1544,7 +1558,7 @@ BattleCommand_ResetTypeMatchup:
INCLUDE "engine/battle/ai/switch.asm"
INCLUDE "data/types/type_matchups.asm"
;INCLUDE "data/types/type_matchups.asm"
BattleCommand_DamageVariation:
; Modify the damage spread between 85% and 100%.