diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-13 22:53:20 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-13 22:53:20 -0700 |
| commit | e23f34125879e680e1a6ee263cb3dbb579cc5135 (patch) | |
| tree | 2474334d0166f7889ad46689dd80b542383143e3 /items | |
| parent | eb9fc6676cfed0460d19ce441134dbcdfce49b0d (diff) | |
Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 61ff2033e..820d18399 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -238,10 +238,10 @@ ParkBall: ; e8a2 ld a, [EnemyMonCatchRate] ld b, a ld a, [BattleType] - cp $3 + cp BATTLETYPE_TUTORIAL jp z, .asm_e99c ld a, [CurItem] - cp $1 + cp MASTER_BALL jp z, .asm_e99c ld a, [CurItem] ld c, a |