summaryrefslogtreecommitdiff
path: root/scripts/silphco2.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-05 16:20:29 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-05 16:25:58 -0500
commitf8a9c37a0019eb085c22c6e3ae53b16ff0cd4f6a (patch)
tree53ef4ec4b7ab591f1ba98322405c6b1e645a21e2 /scripts/silphco2.asm
parent891627d4ba193dd839e03e9e30f1e492e57eac9f (diff)
Use more lb
and other clean up
Diffstat (limited to 'scripts/silphco2.asm')
-rwxr-xr-xscripts/silphco2.asm14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm
index b758455e..ecb3b5a5 100755
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@@ -13,7 +13,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
bit 5, [hl]
res 5, [hl]
ret z
- ld hl, DataTable_59d3e
+ ld hl, SilphCo2GateCoords
call SilphCo2Script_59d43
call SilphCo2Script_59d6f
CheckEvent EVENT_SILPH_CO_2_UNLOCKED_DOOR1
@@ -21,7 +21,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
push af
ld a, $54
ld [wNewTileBlockID], a
- ld bc, $0202
+ lb bc, 2, 2
predef ReplaceTileBlock
pop af
.asm_59d2e
@@ -29,11 +29,13 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
ret nz
ld a, $54
ld [wNewTileBlockID], a
- ld bc, $0502
+ lb bc, 5, 2
predef_jump ReplaceTileBlock
-DataTable_59d3e: ; 59d3e (16:5d3e)
- db $02,$02,$05,$02,$FF
+SilphCo2GateCoords: ; 59d3e (16:5d3e)
+ db $02,$02
+ db $05,$02
+ db $FF
SilphCo2Script_59d43: ; 59d43 (16:5d43)
push hl
@@ -141,7 +143,7 @@ SilphCo2Text1: ; 59dc1 (16:5dc1)
jr nz, .asm_59de4
ld hl, SilphCo2Text_59ded
call PrintText
- ld bc, (TM_36 << 8) | 1
+ lb bc, TM_36, 1
call GiveItem
ld hl, TM36NoRoomText
jr nc, .asm_59de7