diff options
Diffstat (limited to 'items/item_effects.asm')
| -rwxr-xr-x | items/item_effects.asm | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index cdbaacc2..5cb96ba5 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1,11 +1,11 @@ _DoItemEffect:: ; e7a6 (3:67a6) - ld a, [wd002] + ld a, [wCurItem] ld [wd151], a call GetItemName call CopyName1 ld a, $1 ld [wFieldMoveSucceeded], a - ld a, [wd002] + ld a, [wCurItem] dec a ld hl, .ItemEffects rst JumpTable @@ -219,7 +219,7 @@ UltraBall: ; e926 .room_in_party_or_pc xor a ld [wWildMon], a - ld a, [wd002] + ld a, [wCurItem] cp PARK_BALL call nz, ReturnToBattle_UseBall ld hl, wOptions @@ -231,10 +231,10 @@ UltraBall: ; e926 ld a, [wBattleType] cp BATTLETYPE_TUTORIAL jp z, .catch_without_fail - ld a, [wd002] + ld a, [wCurItem] cp MASTER_BALL jp z, .catch_without_fail - ld a, [wd002] + ld a, [wCurItem] ld c, a ld hl, BallMultiplierFunctionTable ; $6c73 .get_multiplier_loop @@ -256,7 +256,7 @@ UltraBall: ; e926 jp hl .skip_or_return_from_ball_fn - ld a, [wd002] + ld a, [wCurItem] cp LEVEL_BALL ld a, b jp z, .skip_hp_calc @@ -382,7 +382,7 @@ UltraBall: ; e926 ld [wWildMon], a ld c, 20 call DelayFrames - ld a, [wd002] + ld a, [wCurItem] cp POKE_BALL + 1 jr c, .asm_ea34 ld a, $5 @@ -519,7 +519,7 @@ UltraBall: ; e926 ld [wMonType], a call ClearSprites predef TryAddMonToParty - ld a, [wd002] + ld a, [wCurItem] cp FRIEND_BALL jr nz, .skip_party_mon_friend_ball ld a, [wPartyCount] @@ -568,7 +568,7 @@ UltraBall: ; e926 ld hl, wBattleResult set 7, [hl] .not_full_yet - ld a, [wd002] + ld a, [wCurItem] cp FRIEND_BALL jr nz, .skip_box_mon_friend_ball ld a, FRIEND_BALL_HAPPINESS @@ -1111,7 +1111,7 @@ StatStrings: .special db "SPECIAL@" Functionef2d: ; ef2d (3:6f2d) - ld a, [wd002] + ld a, [wCurItem] ld hl, StatOffsets .asm_ef33 cp [hl] @@ -1329,7 +1329,7 @@ Functionf086: ; f086 (3:7086) Functionf0ae: ; f0ae (3:70ae) push hl - ld a, [wd002] + ld a, [wCurItem] ld hl, .healingactions ; $70c7 ld bc, $3 .asm_f0b8 @@ -1421,7 +1421,7 @@ Functionf12c: ; f12c (3:712c) .asm_f15a xor a ld [wLowHealthAlarm], a - ld a, [wd002] + ld a, [wCurItem] cp REVIVE jr z, .asm_f16a call Functionf319 @@ -1822,7 +1822,7 @@ GetOneFifthMaxHP: ; f3ce (3:73ce) Functionf3eb: ; f3eb (3:73eb) push hl - ld a, [wd002] + ld a, [wCurItem] ld hl, HealingItemParameters ld d, a .asm_f3f3 @@ -1862,6 +1862,7 @@ HealingItemParameters: dbw BERRY_JUICE, 20 dbw -1, 0 +Softboiled_MilkDrinkFunction: ld a, [wPartyMenuCursor] dec a ld b, a @@ -2001,7 +2002,7 @@ XDefend: ; f515 XSpecial: ; f515 XSpeed: ; f515 call Functionf7d0 - ld a, [wd002] + ld a, [wCurItem] ld hl, .x_item_table .asm_f51e cp [hl] @@ -2148,7 +2149,7 @@ MaxElixer: ; f606 MaxEther: ; f606 Mysteryberry: ; f606 PPUp: ; f606 (3:7606) - ld a, [wd002] + ld a, [wCurItem] ld [wMovementBufferCount], a .asm_f60c ld b, $1 |