diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/pallettown.asm | |
| parent | Revert "Revert "data/facing.asm, titlescreen functions, oam/sprite related fu... (diff) | |
| download | pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.gz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.tar.xz pokeyellow-cb414f1480e9117e5d6ee0ab5cb81903e83cde9a.zip | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/pallettown.asm')
| -rwxr-xr-x | scripts/pallettown.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index e4c3f135..106d8ec0 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73) PalletTownScript0: ; 18e81 (6:4e81) CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz - ld a,[W_YCOORD] + ld a,[wYCoord] cp 1 ; is player near north exit? ret nz xor a @@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) call SetSpriteFacingDirectionAndDelay call Delay3 ld a,1 - ld [W_YCOORD],a + ld [wYCoord],a ld a,1 ld [hNPCPlayerRelativePosPerspective],a ld a,1 |