From f8a9c37a0019eb085c22c6e3ae53b16ff0cd4f6a Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Wed, 5 Aug 2015 16:20:29 -0500
Subject: Use more lb

and other clean up
---
 scripts/silphco7.asm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'scripts/silphco7.asm')

diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 44e92475..525405c7 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -13,7 +13,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
-	ld hl, DataTable_51bc1
+	ld hl, SilphCo7GateCoords
 	call SilphCo7Text_51bc8
 	call SilphCo7Text_51bf4
 	CheckEvent EVENT_SILPH_CO_7_UNLOCKED_DOOR1
@@ -21,7 +21,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	push af
 	ld a, $54
 	ld [wNewTileBlockID], a
-	ld bc, $305
+	lb bc, 3, 5
 	predef ReplaceTileBlock
 	pop af
 .asm_51b9e
@@ -30,7 +30,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	push af
 	ld a, $54
 	ld [wNewTileBlockID], a
-	ld bc, $20a
+	lb bc, 2, 10
 	predef ReplaceTileBlock
 	pop af
 .asm_51bb1
@@ -38,11 +38,14 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ret nz
 	ld a, $54
 	ld [wNewTileBlockID], a
-	ld bc, $60a
+	lb bc, 6, 10
 	predef_jump ReplaceTileBlock
 
-DataTable_51bc1: ; 51bc1 (14:5bc1)
-	db $03,$05,$02,$0A,$06,$0A,$FF
+SilphCo7GateCoords: ; 51bc1 (14:5bc1)
+	db $03,$05
+	db $02,$0A
+	db $06,$0A
+	db $FF
 
 SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
 	push hl
@@ -329,7 +332,7 @@ SilphCo7Text1:
 .givelapras
 	ld hl, .MeetLaprasGuyText
 	call PrintText
-	ld bc, (LAPRAS << 8) | 15
+	lb bc, LAPRAS, 15
 	call GivePokemon
 	jr nc, .done
 	ld a, [wSimulatedJoypadStatesEnd]
-- 
cgit v1.3.1-sl0p