summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 17:49:03 -0700
committerGitHub <noreply@github.com>2016-06-11 17:49:03 -0700
commitdb0ac16b6b4f257de338d1aaac561e681ca8723a (patch)
treed6888723f443557ce45c9a00d873caa5e7a8930e /engine/items
parent401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff)
parentf5983c0f813d3d908b6016db3ed866e4ca9437dc (diff)
Merge pull request #14 from PikalaxALT/master
Yellow documentation
Diffstat (limited to 'engine/items')
-rwxr-xr-xengine/items/items.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 1858c5f0..e3fe4655 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1928,8 +1928,8 @@ ItemUsePokeflute: ; dfbd (3:5fbd)
ld hl, PlayedFluteHadEffectText
call PrintText
call ItemUseReloadOverworldData
- ld e, $1a
- callab Func_fd001
+ ldpikaemotion e, PikachuEmotion26
+ callab PlaySpecificPikachuEmotion
ret
.noSnorlaxOrPikachuToWakeUp