diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 10:39:06 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 10:39:06 -0400 |
| commit | f8c17542385e9004bd1730f1f01c97a60fe0e1a6 (patch) | |
| tree | 32b9f36124669fd6ae85dba6969d0eeb7d2f6392 /engine/items | |
| parent | 97c1f9dd27250f4bea46e8a3367f25127f119781 (diff) | |
Harmonize engine/{gfx, items, link, math} with pokecrystal
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 13 | ||||
| -rw-r--r-- | engine/items/tmhm2.asm | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 35a7cd6c..b9755cb8 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -747,7 +747,7 @@ HeavyBallMultiplier: add hl, de rlca rlca - and %11 + maskbits NUM_DEX_ENTRY_BANKS add BANK("Pokedex Entries 001-064") ld d, a ld a, BANK(PokedexDataPointerTable) @@ -2069,16 +2069,15 @@ XAccuracyEffect: PokeDollEffect: ld a, [wBattleMode] - dec a - jr nz, .asm_f4f6 - inc a + dec a ; WILD_BATTLE? + jr nz, .not_wild + inc a ; TRUE ld [wForcedSwitch], a - ; set battle draw - inc a + inc a ; DRAW ld [wBattleResult], a jp UseItemText -.asm_f4f6 +.not_wild xor a ld [wItemEffectSucceeded], a ret diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index eb3eb58e..0c2ef8de 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_11a45 + jr z, .found inc c jr .loop -.asm_11a45 +.found pop hl ld b, CHECK_FLAG push de |