ref: 4aa3d3e31a097222b446e9ff11965a38360e1c16
parent: b4df25a1e155cc383d6a2cc628b3830ae2e1e961
author: IIMarckus <iimarckus@gmail.com>
date: Thu Oct 23 20:43:50 EDT 2014
Fix bad merge.
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -734,7 +734,7 @@
; which ball is used in a certain situation.
dbw ULTRA_BALL, UltraBallMultiplier
dbw GREAT_BALL, GreatBallMultiplier
- dbw 8, GreatBallMultiplier ; Safari Ball, leftover from RBY
+ dbw 8, SafariBallMultiplier ; Safari Ball, leftover from RBY
dbw HEAVY_BALL, HeavyBallMultiplier
dbw LEVEL_BALL, LevelBallMultiplier
dbw LURE_BALL, LureBallMultiplier
@@ -741,7 +741,7 @@
dbw FAST_BALL, FastBallMultiplier
dbw MOON_BALL, MoonBallMultiplier
dbw LOVE_BALL, LoveBallMultiplier
- dbw PARK_BALL, GreatBallMultiplier
+ dbw PARK_BALL, ParkBallMultiplier
db $ff
UltraBallMultiplier:
@@ -751,7 +751,9 @@
ld b, $ff
ret
+SafariBallMultiplier:
GreatBallMultiplier:
+ParkBallMultiplier:
; multiply catch rate by 1.5
ld a, b
srl a
@@ -944,7 +946,7 @@
push bc
ld a, BANK(EvosAttacks)
call GetFarByte
- cp MOON_STONE_RED ; BURN_HEAL (in Red)
+ cp MOON_STONE_RED ; BURN_HEAL
pop bc
ret nz