diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/viridianmart.asm | |
parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/viridianmart.asm')
-rwxr-xr-x | scripts/viridianmart.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index b69e24c2..18832353 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -2,7 +2,7 @@ ViridianMartScript: ; 1d46e (7:546e) call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers - ld a, [W_VIRIDIANMARKETCURSCRIPT] + ld a, [wViridianMarketCurScript] call JumpTable ret @@ -37,7 +37,7 @@ ViridianMartScript0: ; 1d49b (7:549b) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret RLEMovement1d4bb: ; 1d4bb (7:54bb) @@ -57,7 +57,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret ViridianMartScript2: ; 1d4df (7:54df) |