diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/billshouse2.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/billshouse2.asm')
| -rwxr-xr-x | scripts/billshouse2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index a93f5558..87016aa8 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -83,7 +83,7 @@ BillsHouseText_f24a9: TX_FAR _BillsHouseText_1e8da db "@" -Func_f24ae: ; f24ae +Func_f24ae: ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 @@ -114,7 +114,7 @@ Func_f24d5: call UpdateSprites call UpdateSprites ld hl, Data_f2505 - call Func_159b + call ApplyPikachuMovementData ld a, $f ; pikachu ld [wEmotionBubbleSpriteIndex], a ld a, $1 @@ -135,10 +135,10 @@ Data_f2505: Func_f250b: ld hl, Data_f251c ld b, SPRITE_FACING_UP - call Func_f0a82 + call TryApplyPikachuMovementData ld hl, Data_f2521 ld b, SPRITE_FACING_RIGHT - call Func_f0a82 + call TryApplyPikachuMovementData ret Data_f251c: |