Harmonize engine/{gfx, items, link, math} with pokegold

This commit is contained in:
Rangi
2020-06-17 10:39:17 -04:00
parent f2550fc3c2
commit 8019db3ea9
13 changed files with 69 additions and 73 deletions

View File

@@ -2097,9 +2097,9 @@ XAccuracyEffect:
PokeDollEffect:
ld a, [wBattleMode]
dec a
jr nz, .asm_f4a6
inc a
dec a ; WILD_BATTLE?
jr nz, .not_wild
inc a ; TRUE
ld [wForcedSwitch], a
ld a, [wBattleResult]
and BATTLERESULT_BITMASK
@@ -2107,7 +2107,7 @@ PokeDollEffect:
ld [wBattleResult], a
jp UseItemText
.asm_f4a6
.not_wild
xor a
ld [wItemEffectSucceeded], a
ret

View File

@@ -14,11 +14,11 @@ CanLearnTMHMMove:
and a
jr z, .end
cp b
jr z, .asm_11659
jr z, .found
inc c
jr .loop
.asm_11659
.found
pop hl
ld b, CHECK_FLAG
push de