summaryrefslogtreecommitdiff
path: root/scripts/lorelei.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/lorelei.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/lorelei.asm')
-rwxr-xr-xscripts/lorelei.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index 670b6b66..33f419a3 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -42,8 +42,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb)
LoreleiScript4: ; 761c5 (1d:61c5)
ret
asm_761c6: ; 761c6 (1d:61c6)
- ld hl, wccd3
- ld a, $40
+ ld hl, wSimulatedJoypadStatesEnd
+ ld a, D_UP
ld [hli], a
ld [hli], a
ld [hli], a
@@ -51,8 +51,8 @@ asm_761c6: ; 761c6 (1d:61c6)
ld [hli], a
ld [hl], a
ld a, $6
- ld [wcd38], a
- call Func_3486
+ ld [wSimulatedJoypadStatesIndex], a
+ call StartSimulatingJoypadStates
ld a, $3
ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -64,8 +64,8 @@ LoreleiScript0: ; 761e2 (1d:61e2)
xor a
ld [hJoyPressed], a
ld [hJoyHeld], a
- ld [wccd3], a
- ld [wcd38], a
+ ld [wSimulatedJoypadStatesEnd], a
+ ld [wSimulatedJoypadStatesIndex], a
ld a, [wWhichTrade] ; wWhichTrade
cp $3
jr c, .asm_76206
@@ -77,11 +77,11 @@ LoreleiScript0: ; 761e2 (1d:61e2)
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld a, $40
- ld [wccd3], a
+ ld a, D_UP
+ ld [wSimulatedJoypadStatesEnd], a
ld a, $1
- ld [wcd38], a
- call Func_3486
+ ld [wSimulatedJoypadStatesIndex], a
+ call StartSimulatingJoypadStates
ld a, $3
ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -95,7 +95,7 @@ CoordsData_76223: ; 76223 (1d:6223)
db $FF
LoreleiScript3: ; 7622c (1d:622c)
- ld a, [wcd38]
+ ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3