summaryrefslogtreecommitdiff
path: root/scripts/rockethideout2.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/rockethideout2.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/rockethideout2.asm')
-rwxr-xr-xscripts/rockethideout2.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm
index aa8d31a4..326c1605 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -24,7 +24,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
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
@@ -306,7 +306,7 @@ RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb)
db $FF
RocketHideout2Script3: ; 44fc2 (11:4fc2)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
jr nz, LoadSpinnerArrowTiles
xor a
@@ -333,7 +333,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
jr z, .asm_44ff6
ld hl, GymSpinnerArrows ; $5053
.asm_44ff6
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
bit 0, a
jr nz, .asm_45001
ld de, $18