diff options
author | yenatch <yenatch@gmail.com> | 2015-09-09 16:02:55 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2015-09-09 16:02:55 -0400 |
commit | cc0d5d4c8bb9721f8ab0354d87c8f6d848dbe23b (patch) | |
tree | 2ab9e19e9f85d1894b42cb93dd969fa57327b0ed /items/item_effects.asm | |
parent | c432709715df83f5cd063fd5b14684389e037e15 (diff) | |
parent | 0d4c2776d927e5d3162d9a4430fc82f35bf50be5 (diff) |
Merge pull request #312 from JimB16/master
Added comments and changed labels (mainly for BattleTower)
Diffstat (limited to 'items/item_effects.asm')
-rw-r--r-- | items/item_effects.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 8c574da88..6ad0d8947 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -273,7 +273,7 @@ endr jp z, .asm_e98e ld a, b - ld [$ffb6], a + ld [hMultiplicand + 2], a ld hl, EnemyMonHP ld b, [hl] @@ -318,9 +318,9 @@ endr sub c ld [hMultiplier], a xor a - ld [hProduct], a - ld [hMultiplicand], a - ld [$ffb5], a + ld [hDividend + 0], a + ld [hMultiplicand + 0], a + ld [hMultiplicand + 1], a call Multiply pop bc @@ -329,7 +329,7 @@ endr ld b, $4 call Divide - ld a, [$ffb6] + ld a, [hQuotient + 2] and a jr nz, .statuscheck ld a, 1 @@ -618,7 +618,7 @@ endr .asm_eb3c call ClearSprites - predef Functionde6e + predef SentPkmnIntoBox callba Function4db83 |