diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 14:00:29 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-23 14:00:29 -0500 |
| commit | 3893feb835ef4959b77148668da90aaed3189b00 (patch) | |
| tree | 5d39196a1cdc146f85a6f058222811b4241efd1e /items | |
| parent | ddc05ec8dd36eb88d48a5dab258f4daae85eadc3 (diff) | |
Battle Anim Object struct constants
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index faa35133f..827e35f57 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -413,7 +413,7 @@ endr xor a ld [hBattleTurn], a ld [Buffer2], a - ld [wcfca], a + ld [wNumHits], a predef PlayBattleAnim ld a, [wWildMon] @@ -2161,7 +2161,7 @@ endr Softboiled_MilkDrinkFunction: ; f3df (3:73df) ; Softboiled/Milk Drink in the field - ld a, [wd0d8] + ld a, [wPartyMenuCursor] dec a ld b, a call .SelectMilkDrinkRecipient ; select pokemon @@ -2186,7 +2186,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df) .skip ld a, b inc a - ld [wd0d8], a + ld [wPartyMenuCursor], a ret .SelectMilkDrinkRecipient: ; f419 (3:7419) @@ -2197,7 +2197,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df) call ChoosePkmnToUseItemOn pop bc jr c, .set_carry - ld a, [wd0d8] + ld a, [wPartyMenuCursor] dec a ld c, a ld a, b @@ -2958,7 +2958,7 @@ UseBallInTrainerBattle: ; f7a0 xor a ld [wKickCounter], a ld [hBattleTurn], a - ld [wcfca], a + ld [wNumHits], a predef PlayBattleAnim ld hl, BlockedTheBallText call PrintText |