diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
| commit | 13e28b0ece7c7888cba792cc6f7219b384213427 (patch) | |
| tree | 4dcd58e0fe7ac33bf38817f423754dc758cb902f /scripts/pallettown.asm | |
| parent | Merge branch 'master' of https://github.com/YamaArashi/pokered (diff) | |
| parent | constants for flag actions (diff) | |
| download | pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.gz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.xz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.zip | |
Merge pull request #106 from YamaArashi/master
jpab/jpba macros
Diffstat (limited to 'scripts/pallettown.asm')
| -rwxr-xr-x | scripts/pallettown.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 327a32ff..b463c4d6 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -28,8 +28,8 @@ PalletTownScript0: ; 18e81 (6:4e81) ret nz xor a ld [hJoyHeld],a - ld a,4 - ld [wd528],a + ld a,PLAYER_DIR_DOWN + ld [wPlayerMovingDirection],a ld a,$FF call PlaySound ; stop music ld a, BANK(Music_MeetProfOak) @@ -190,8 +190,8 @@ OakAppearsText: ; 18fb0 (6:4fb0) ld [wEmotionBubbleSpriteIndex],a ; player's sprite ld [wWhichEmotionBubble],a ; EXCLAMATION_BUBBLE predef EmotionBubble - ld a,4 - ld [wd528],a + ld a,PLAYER_DIR_DOWN + ld [wPlayerMovingDirection],a jp TextScriptEnd OakWalksUpText: ; 18fce (6:4fce) |