diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /engine/items/items.asm | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
| parent | 12b2aba4c3e112628a904e7336d8b2413c56da74 (diff) | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'engine/items/items.asm')
| -rwxr-xr-x | engine/items/items.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index eca9eaef..f37f9f47 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1765,7 +1765,7 @@ ItemUsePokeflute: ; dfbd (3:5fbd) .notRoute16 cp a,PEWTER_POKECENTER jr nz,.noSnorlaxOrPikachuToWakeUp - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr z,.noSnorlaxOrPikachuToWakeUp callab Func_fcb01 jr nc,.noSnorlaxOrPikachuToWakeUp |