aboutsummaryrefslogtreecommitdiffstats
path: root/engine/give_pokemon.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
committeryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
commitb65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch)
tree151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/give_pokemon.asm
parentrename hJoyHeldLast -> hJoyLast (diff)
parentRename some labels (diff)
downloadpokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz
pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz
pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/give_pokemon.asm')
-rwxr-xr-xengine/give_pokemon.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm
index d4d58d33..64876d22 100755
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -14,7 +14,7 @@ _GivePokemon: ; 4fda5 (13:7da5)
ld [wEnemyMonSpecies2], a
callab LoadEnemyMonData
call SetPokedexOwnedFlag
- callab Func_e7a4
+ callab SendNewMonToBox
ld hl, wcf4b
ld a, [wd5a0]
and $7f