diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
| commit | 5459477ecd3c60342f31881343bc921b41b94eb0 (patch) | |
| tree | aed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/pallettown.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/pallettown.asm')
| -rwxr-xr-x | scripts/pallettown.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index e7bd2f57..c43b9682 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -54,7 +54,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) call DisplayTextID ld a,$FF ld [wJoyIgnore],a - ld a,0 + ld a,HS_PALLET_TOWN_OAK ld [wcc4d],a predef ShowObject @@ -141,10 +141,10 @@ PalletTownScript5: ; 18f56 (6:4f56) jr nz,.next ld hl,wd74a set 2,[hl] - ld a,$27 + ld a,HS_DAISY_SITTING ld [wcc4d],a predef HideObject - ld a,$28 + ld a,HS_DAISY_WALKING ld [wcc4d],a predef_jump ShowObject .next |