From cb414f1480e9117e5d6ee0ab5cb81903e83cde9a Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Thu, 29 Oct 2015 14:23:30 -0400 Subject: overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE Also make replace.sh take args --- scripts/pallettown.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/pallettown.asm') 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 -- cgit v1.3.1-sl0p