From 38065a744de1065cc021a4cafe22476f8425448d Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 30 Aug 2015 21:38:41 -0500 Subject: No more W_ --- scripts/cinnabarisland.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/cinnabarisland.asm') diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index c06c784c..7f8616b1 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -5,7 +5,7 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers - ld a, [W_CINNABARISLANDCURSCRIPT] + ld a, [wCinnabarIslandCurScript] jp CallFunctionInTable CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) @@ -16,10 +16,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld b, SECRET_KEY call IsItemInBag ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 ret nz ld a, PLAYER_DIR_UP @@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ld a, $1 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandScript1: ; 1ca73 (7:4a73) @@ -47,7 +47,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ret nz call Delay3 ld a, $0 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandTextPointers: ; 1ca81 (7:4a81) -- cgit v1.3.1-sl0p