summaryrefslogtreecommitdiff
path: root/scripts/cinnabarisland.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/cinnabarisland.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/cinnabarisland.asm')
-rwxr-xr-xscripts/cinnabarisland.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm
index 8d27198b..33a497c4 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -32,10 +32,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
xor a
ld [hJoyHeld], a
ld a, $1
- ld [wcd38], a
- ld a, $80
- ld [wccd3], a
- call Func_3486
+ ld [wSimulatedJoypadStatesIndex], a
+ ld a, D_DOWN
+ ld [wSimulatedJoypadStatesEnd], a
+ call StartSimulatingJoypadStates
xor a
ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
@@ -44,7 +44,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
ret
CinnabarIslandScript1: ; 1ca73 (7:4a73)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3