diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
| commit | 12c1d874b94cf51523b072477a59b0cc398fc8d3 (patch) | |
| tree | a3940230cf443d809780f8f7b19748f782b17fdd /items/item_effects.asm | |
| parent | 724215ea7519c28b602f72440e1ec73e2e6cf388 (diff) | |
| parent | c0a01c998240bacae77addbb08a5d2133cf58a21 (diff) | |
Merge branch 'master' into refactor-preprocessor
Conflicts:
preprocessor.py
Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.
Diffstat (limited to 'items/item_effects.asm')
| -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 cdca23be0..342f61926 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -166,7 +166,7 @@ ParkBall: ; e8a2 .asm_e98e ld b, a ld [MagikarpLength], a - call RNG + call Random cp b ld a, $0 @@ -1212,7 +1212,7 @@ BitterBerry: ; f16a call $7789 ld hl, $4d81 - call FarBattleTextBox + call StdBattleTextBox ld a, $0 |