summaryrefslogtreecommitdiff
path: root/scripts/viridiangym.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/viridiangym.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/viridiangym.asm')
-rwxr-xr-xscripts/viridiangym.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 65ad3553..4c9e6821 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -38,7 +38,7 @@ ViridianGymScript0: ; 748eb (1d:48eb)
call Func_3442
cp $ff
jp z, CheckFightingMapTrainers
- call Func_3486
+ call StartSimulatingJoypadStates
ld hl, wd736
set 7, [hl]
ld a, (SFX_02_52 - SFX_Headers_02) / 3
@@ -121,7 +121,7 @@ ViridianGymArrowMovement12: ; 74968 (1d:4968)
db $20,$0C,$FF
ViridianGymScript4: ; 7496b (1d:496b)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
jr nz, .asm_74980
xor a