summaryrefslogtreecommitdiff
path: root/scripts/rockethideout3.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/rockethideout3.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/rockethideout3.asm')
-rwxr-xr-xscripts/rockethideout3.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm
index e3223a85..3870c6b6 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -24,7 +24,7 @@ RocketHideout3Script0: ; 45240 (11:5240)
jp z, CheckFightingMapTrainers
ld hl, wd736
set 7, [hl]
- call Func_3486
+ call StartSimulatingJoypadStates
ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound
ld a, $ff
@@ -136,7 +136,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
db $FF
RocketHideout3Script3 ; 452e4 (11:452e4)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
jp nz, LoadSpinnerArrowTiles
xor a