summaryrefslogtreecommitdiff
path: root/scripts/viridianmart.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2014-09-09 20:55:19 -0700
committerYamaArashi <shadow962@live.com>2014-09-09 20:55:19 -0700
commit91793015e53dbed09576f825d39e71bc59bf90a5 (patch)
tree2e21a17f28744e759c70bdef4197adaa043fe938 /scripts/viridianmart.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/viridianmart.asm')
-rwxr-xr-xscripts/viridianmart.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm
index a02231f8..d33dfe81 100755
--- a/scripts/viridianmart.asm
+++ b/scripts/viridianmart.asm
@@ -30,12 +30,12 @@ ViridianMartScript0: ; 1d49b (7:549b)
ld a, $4
ld [$ff8c], a
call DisplayTextID
- ld hl, wccd3
+ ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement1d4bb
call DecodeRLEList
dec a
- ld [wcd38], a
- call Func_3486
+ ld [wSimulatedJoypadStatesIndex], a
+ call StartSimulatingJoypadStates
ld a, $1
ld [W_VIRIDIANMARKETCURSCRIPT], a
ret
@@ -46,7 +46,7 @@ RLEMovement1d4bb: ; 1d4bb (7:54bb)
db $ff
ViridianMartScript1: ; 1d4c0 (7:54c0)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3