pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge.

Browse Source
This commit is contained in:
IIMarckus 2014-10-24 00:43:50 -06:00
parent b4df25a1e1
commit 4aa3d3e31a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
items/item_effects.asm
View File

@ -734,14 +734,14 @@ BallMultiplierFunctionTable:
; which ball is used in a certain situation. ; which ball is used in a certain situation.
dbw ULTRA_BALL, UltraBallMultiplier dbw ULTRA_BALL, UltraBallMultiplier
dbw GREAT_BALL, GreatBallMultiplier 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 HEAVY_BALL, HeavyBallMultiplier
dbw LEVEL_BALL, LevelBallMultiplier dbw LEVEL_BALL, LevelBallMultiplier
dbw LURE_BALL, LureBallMultiplier dbw LURE_BALL, LureBallMultiplier
dbw FAST_BALL, FastBallMultiplier dbw FAST_BALL, FastBallMultiplier
dbw MOON_BALL, MoonBallMultiplier dbw MOON_BALL, MoonBallMultiplier
dbw LOVE_BALL, LoveBallMultiplier dbw LOVE_BALL, LoveBallMultiplier
dbw PARK_BALL, GreatBallMultiplier dbw PARK_BALL, ParkBallMultiplier
db $ff db $ff
UltraBallMultiplier: UltraBallMultiplier:
@ -751,7 +751,9 @@ UltraBallMultiplier:
ld b, $ff ld b, $ff
ret ret
SafariBallMultiplier:
GreatBallMultiplier: GreatBallMultiplier:
ParkBallMultiplier:
; multiply catch rate by 1.5 ; multiply catch rate by 1.5
ld a, b ld a, b
srl a srl a
@ -944,7 +946,7 @@ GLOBAL EvosAttacksPointers
push bc push bc
ld a, BANK(EvosAttacks) ld a, BANK(EvosAttacks)
call GetFarByte call GetFarByte
cp MOON_STONE_RED ; BURN_HEAL (in Red) cp MOON_STONE_RED ; BURN_HEAL
pop bc pop bc
ret nz ret nz