From f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 3 Jul 2015 14:38:12 -0500
Subject: Rename/organize part 2 of 4 rename functions, clean up address/wram
 comments, other misc only broken up so that all changes are viewable on
 github

---
 scripts/billshouse.asm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'scripts/billshouse.asm')

diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 61a575b9..321e8808 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -19,7 +19,7 @@ BillsHouseScript1: ; 1e783 (7:6783)
 	ld a, [wSpriteStateData1 + 9]
 	and a
 	ld de, MovementData_1e79c
-	jr nz, .asm_1e78f ; 0x1e78a $3
+	jr nz, .asm_1e78f
 	ld de, MovementData_1e7a0
 .asm_1e78f
 	ld a, $1
@@ -70,7 +70,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	ld a, HS_BILL_1
 	ld [wcc4d], a
 	predef ShowObject
-	ld c, $8
+	ld c, 8
 	call DelayFrames
 	ld a, $2
 	ld [$ff8c], a
@@ -121,37 +121,37 @@ BillsHouseText1: ; 1e83d (7:683d)
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, asm_6b196 ; 0x1e84b $d
-asm_4d03c: ; 1e84d (7:684d)
+	jr nz, .asm_1e85a
+.asm_1e84d
 	ld hl, BillsHouseText_1e86a
 	call PrintText
 	ld a, $1
 	ld [W_BILLSHOUSECURSCRIPT], a
-	jr asm_fd4e2 ; 0x1e858 $8
-asm_6b196: ; 1e85a (7:685a)
+	jr .asm_1e862
+.asm_1e85a
 	ld hl, BillsHouseText_1e86f
 	call PrintText
-	jr asm_4d03c ; 0x1e860 $eb
-asm_fd4e2 ; 0x1e862
+	jr .asm_1e84d
+.asm_1e862
 	jp TextScriptEnd
 
 BillsHouseText_1e865: ; 1e865 (7:6865)
-	TX_FAR _BillsHouseText_1e865 ; 0x8d267
+	TX_FAR _BillsHouseText_1e865
 	db "@"
 
 BillsHouseText_1e86a: ; 1e86a (7:686a)
-	TX_FAR _BillsHouseText_1e86a ; 0x8d345
+	TX_FAR _BillsHouseText_1e86a
 	db "@"
 
 BillsHouseText_1e86f: ; 1e86f (7:686f)
-	TX_FAR _BillsHouseText_1e86f ; 0x8d391
+	TX_FAR _BillsHouseText_1e86f
 	db "@"
 
 BillsHouseText2: ; 1e874 (7:6874)
 	db $08 ; asm
 	ld a, [wd7f2]
 	bit 4, a
-	jr nz, .asm_5491f ; 0x1e87a
+	jr nz, .asm_1e8a9
 	ld hl, BillThankYouText
 	call PrintText
 	ld bc, (S_S__TICKET << 8) | 1
@@ -167,14 +167,14 @@ BillsHouseText2: ; 1e874 (7:6874)
 	ld a, HS_CERULEAN_GUARD_2
 	ld [wcc4d], a
 	predef HideObject
-.asm_5491f ; 0x1e8a9
+.asm_1e8a9
 	ld hl, BillsHouseText_1e8cb
 	call PrintText
-	jr .asm_bd408 ; 0x1e8af
+	jr .asm_1e8b7
 .BagFull
 	ld hl, SSTicketNoRoomText
 	call PrintText
-.asm_bd408 ; 0x1e8b7
+.asm_1e8b7
 	jp TextScriptEnd
 
 BillThankYouText: ; 1e8ba (7:68ba)
-- 
cgit v1.2.3


From 8431fa7756dace97413f4c35aaa44cd92cf5b6df Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 3 Jul 2015 14:58:50 -0500
Subject: TX_ASM

---
 scripts/billshouse.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/billshouse.asm')

diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 321e8808..df608de3 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -115,7 +115,7 @@ BillsHouseText4: ; 1e83c (7:683c)
 	db $fd
 
 BillsHouseText1: ; 1e83d (7:683d)
-	db $8
+	TX_ASM
 	ld hl, BillsHouseText_1e865
 	call PrintText
 	call YesNoChoice
@@ -148,7 +148,7 @@ BillsHouseText_1e86f: ; 1e86f (7:686f)
 	db "@"
 
 BillsHouseText2: ; 1e874 (7:6874)
-	db $08 ; asm
+	TX_ASM
 	ld a, [wd7f2]
 	bit 4, a
 	jr nz, .asm_1e8a9
@@ -194,7 +194,7 @@ BillsHouseText_1e8cb: ; 1e8cb (7:68cb)
 	db "@"
 
 BillsHouseText3: ; 1e8d0 (7:68d0)
-	db $08 ; asm
+	TX_ASM
 	ld hl, BillsHouseText_1e8da
 	call PrintText
 	jp TextScriptEnd
-- 
cgit v1.2.3