diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-23 16:04:53 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-23 16:04:53 -0500 |
| commit | d972564175bcee324877f1e016fafd349c50e7d3 (patch) | |
| tree | 7a4368ba654bd78ec2fd0b4456afa9fb2a88fead /items | |
| parent | 0dc5ae04b82143b1cbff50a9d25ebe21326305ae (diff) | |
link and seer labels
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 6ab6f6c14..ea0c99881 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -4,7 +4,7 @@ _DoItemEffect:: ; e722 call GetItemName call CopyName1 ld a, 1 - ld [wd0ec], a + ld [wPlayerAction], a ld a, [CurItem] dec a ld hl, ItemEffects @@ -1209,7 +1209,7 @@ SunStone: ; ee0f ld [wd1e9], a callba EvolvePokemon - ld a, [wd268] + ld a, [wMonTriedToEvolve] and a jr z, .NoEffect @@ -1220,7 +1220,7 @@ SunStone: ; ee0f .DecidedNotToUse xor a - ld [wd0ec], a + ld [wPlayerAction], a ret ; ee3d @@ -1293,7 +1293,7 @@ UpdateStatsAfterItem: ; ee8c RareCandy_StatBooster_ExitMenu: ; ee9f xor a - ld [wd0ec], a + ld [wPlayerAction], a jp ClearPalettes ; eea6 @@ -1930,7 +1930,7 @@ StatusHealer_NoEffect: ; f299 (3:7299) StatusHealer_ExitMenu: ; f29e (3:729e) xor a - ld [wd0ec], a + ld [wPlayerAction], a StatusHealer_ClearPalettes: ; f2a2 (3:72a2) call ClearPalettes ret @@ -2233,10 +2233,10 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df) EscapeRope: ; f44f xor a - ld [wd0ec], a + ld [wPlayerAction], a callba EscapeRopeFunction - ld a, [wd0ec] + ld a, [wPlayerAction] cp 1 call z, UseDisposableItem ret @@ -2298,7 +2298,7 @@ PokeDoll: ; f48f .asm_f4a6 xor a - ld [wd0ec], a + ld [wPlayerAction], a ret ; f4ab @@ -2547,7 +2547,7 @@ Mysteryberry: ; f5bf xor a ld [CurMoveNum], a ld a, $2 - ld [wd235], a + ld [wMoveSelectionMenuType], a callba MoveSelectionScreen pop bc @@ -2701,7 +2701,7 @@ PPRestoreItem_NoEffect: ; f6dd PPRestoreItem_Cancel: ; f6e0 call ClearPalettes xor a - ld [wd0ec], a + ld [wPlayerAction], a ret ; f6e8 @@ -2802,7 +2802,7 @@ BasementKey: ; f74c SacredAsh: ; f753 callba _SacredAsh - ld a, [wd0ec] + ld a, [wPlayerAction] cp $1 ret nz call UseDisposableItem @@ -2973,7 +2973,7 @@ WontHaveAnyEffect_NotUsedMessage: ; f7ca ; Item wasn't used. ld a, $2 - ld [wd0ec], a + ld [wPlayerAction], a ret ; f7d6 @@ -2988,7 +2988,7 @@ Ball_BoxIsFullMessage: ; f7dc ; Item wasn't used. ld a, $2 - ld [wd0ec], a + ld [wPlayerAction], a ret ; f7e8 @@ -3018,7 +3018,7 @@ CantGetOnYourBikeMessage: ; f801 CantUseItemMessage: ; f804 ; Item couldn't be used. xor a - ld [wd0ec], a + ld [wPlayerAction], a jp PrintText ; f80b |