summaryrefslogtreecommitdiff
path: root/scripts/lance.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-01-03 14:21:56 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-01-03 14:21:56 -0500
commit115fba107d6e319e2a047a17f5c0dfca723a8d05 (patch)
treef242eec26b51c08505ecb5b8d39bfe5eaac14cd5 /scripts/lance.asm
parent1a5a108bdf6904423bfa80cc7bcb5582331740cb (diff)
parent28dc5686b05477e13a9cc078975315140bee9800 (diff)
Merge pull request #120 from PikalaxALT/master
Fix game time labels, wCurrentMapScriptFlags
Diffstat (limited to 'scripts/lance.asm')
-rwxr-xr-xscripts/lance.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lance.asm b/scripts/lance.asm
index 767edb8a..c7d21d43 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -9,7 +9,7 @@ LanceScript: ; 5a2ae (16:62ae)
ret
LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z
@@ -71,7 +71,7 @@ LanceScript0: ; 5a305 (16:6305)
jr z, WalkToLance
CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR
ret nz
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
set 5, [hl]
ld a, SFX_GO_INSIDE
call PlaySound