diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 10:39:17 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 10:39:17 -0400 |
| commit | 8019db3ea98ee60d3e6675431e07819b83daf04c (patch) | |
| tree | fcaebfe3713ea04f56725127a702456d16417f22 /engine/items | |
| parent | f2550fc3c208508aaba3a9c2f26dcd12d81c6bc5 (diff) | |
Harmonize engine/{gfx, items, link, math} with pokegold
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 8 | ||||
| -rw-r--r-- | engine/items/tmhm2.asm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index b92181d91..82f3f9fc7 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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 diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index 057d0b346..0c2ef8dee 100644 --- a/engine/items/tmhm2.asm +++ b/engine/items/tmhm2.asm @@ -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 |