diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /scripts/pallettown.asm | |
| parent | e181c27c5e396aea254b471b182df3237eeb03ce (diff) | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
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 f29eacd1..41b3eb4f 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -127,7 +127,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ld a, SPRITE_FACING_LEFT .asm_18f01 ld [wSpriteStateData1 + 1 * $10 + 9], a - + ; trigger the next script ld a, 4 ld [W_PALLETTOWNCURSCRIPT], a @@ -188,7 +188,7 @@ PalletTownScript6: ; 18f87 (6:4f87) ld a, 7 ld [W_PALLETTOWNCURSCRIPT], a ret - + PalletTownScript7: ld a, [wNPCMovementScriptPointerTableNum] and a @@ -198,7 +198,7 @@ PalletTownScript7: ld a, 8 ld [W_PALLETTOWNCURSCRIPT], a ret - + PalletTownScript8: CheckEvent EVENT_DAISY_WALKING jr nz, .asm_18f9e |