aboutsummaryrefslogtreecommitdiffstats
path: root/engine/items/item_effects.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-05 23:50:02 -0500
committerGitHub <noreply@github.com>2020-11-05 23:50:02 -0500
commit5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch)
treeab357b894c9457b3d1d38fd49300df34412168f8 /engine/items/item_effects.asm
parentMerge pull request #59 from Rangi42/master (diff)
parentSync more with pokered (diff)
downloadpokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz
pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'engine/items/item_effects.asm')
-rwxr-xr-xengine/items/item_effects.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index d4c3ae18..00a575f1 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -386,7 +386,7 @@ ItemUseBall:
ldh [hDivisor], a
ld b, 4
call Divide
-
+
; Determine Status2.
; no status ailment: Status2 = 0
; Burn/Paralysis/Poison: Status2 = 5
@@ -3092,7 +3092,7 @@ SendNewMonToBox:
ld a, [wcf91]
cp KADABRA
jr nz, .notKadabra
- ld a, $60 ; twistedspoon in gsc
+ ld a, TWISTEDSPOON_GSC
ld [wBoxMon1CatchRate], a
.notKadabra
ret