This commit is contained in:
@@ -1399,16 +1399,16 @@ BattleCheckTypeMatchup:
|
||||
ld hl, wEnemyMonType1
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
jr z, CheckTypeMatchup
|
||||
jr z, .get_type
|
||||
ld hl, wBattleMonType1
|
||||
.get_type
|
||||
ld a, BATTLE_VARS_MOVE_TYPE
|
||||
call GetBattleVar ; preserves hl, de, and bc
|
||||
; fallthrough
|
||||
CheckTypeMatchup:
|
||||
; BUG: AI makes a false assumption about CheckTypeMatchup (see docs/bugs_and_glitches.md)
|
||||
push hl
|
||||
push de
|
||||
push bc
|
||||
ld a, BATTLE_VARS_MOVE_TYPE
|
||||
call GetBattleVar
|
||||
ld d, a
|
||||
ld b, [hl]
|
||||
inc hl
|
||||
@@ -2083,13 +2083,14 @@ BattleCommand_FailureText:
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
|
||||
; BUG: Beat Up may fail to raise Substitute (see docs/bugs_and_glitches.md)
|
||||
cp EFFECT_MULTI_HIT
|
||||
jr z, .multihit
|
||||
cp EFFECT_DOUBLE_HIT
|
||||
jr z, .multihit
|
||||
cp EFFECT_POISON_MULTI_HIT
|
||||
jr z, .multihit
|
||||
cp EFFECT_BEAT_UP
|
||||
jr z, .multihit
|
||||
jp EndMoveEffect
|
||||
|
||||
.multihit
|
||||
|
Reference in New Issue
Block a user