summaryrefslogtreecommitdiff
path: root/scripts/silphco7.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/silphco7.asm
parentdaf4fc87ae66e2c3d56840774efba10a9b903ee3 (diff)
Labelled and commented mostly sprite-related things
Diffstat (limited to 'scripts/silphco7.asm')
-rwxr-xr-xscripts/silphco7.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index bd611763..fff1246e 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -211,7 +211,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld a, $4
ld [$ff8d], a
- call Func_34a6
+ call SetSpriteFacingDirectionAndDelay
ld a, $f
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
@@ -244,7 +244,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
ld a, $a7
ld [wcc4d], a
predef HideObject
- call Func_2307
+ call PlayDefaultMusic
xor a
ld [wJoyIgnore], a
jp SilphCo7Text_51c10
@@ -323,7 +323,7 @@ SilphCo7Text1:
ld bc, (LAPRAS << 8) | 15
call GivePokemon
jr nc, .done
- ld a, [wccd3]
+ ld a, [wSimulatedJoypadStatesEnd]
and a
call z, WaitForTextScrollButtonPress
call EnableAutoTextBoxDrawing