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 /scripts/billshouse2.asm | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
| parent | 12b2aba4c3e112628a904e7336d8b2413c56da74 (diff) | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'scripts/billshouse2.asm')
| -rwxr-xr-x | scripts/billshouse2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 6f62a79f..87a39969 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -87,7 +87,7 @@ Func_f24ae: ; f24ae ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr z, .asm_f24d2 ld a, [W_BILLSHOUSECURSCRIPT] cp $5 @@ -120,7 +120,7 @@ Func_f24d5: ld a, $1 ld [wWhichEmotionBubble], a predef EmotionBubble - call SetPikachuAsleep + call DisablePikachuFollowingPlayer callab InitializePikachuTextID ret |