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/lavenderhouse1.asm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'scripts/lavenderhouse1.asm')

diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm
index 5fd1dd34..ab6d13fd 100755
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/lavenderhouse1.asm
@@ -14,14 +14,14 @@ LavenderHouse1Text1: ; 1d8b8 (7:58b8)
 	db $08 ; asm
 	ld a, [wd7e0]
 	bit 7, a
-	jr nz, .asm_72e5d ; 0x1d8be
+	jr nz, .asm_72e5d
 	ld hl, LavenderHouse1Text_1d8d1
 	call PrintText
-	jr .asm_6957f ; 0x1d8c6
-.asm_72e5d ; 0x1d8c8
+	jr .asm_6957f
+.asm_72e5d
 	ld hl, LavenderHouse1Text_1d8d6
 	call PrintText
-.asm_6957f ; 0x1d8ce
+.asm_6957f
 	jp TextScriptEnd
 
 LavenderHouse1Text_1d8d1: ; 1d8d1 (7:58d1)
@@ -36,14 +36,14 @@ LavenderHouse1Text2: ; 1d8db (7:58db)
 	db $08 ; asm
 	ld a, [wd7e0]
 	bit 7, a
-	jr nz, .asm_06470 ; 0x1d8e1
+	jr nz, .asm_06470
 	ld hl, LavenderHouse1Text_1d8f4
 	call PrintText
-	jr .asm_3d208 ; 0x1d8e9
-.asm_06470 ; 0x1d8eb
+	jr .asm_3d208
+.asm_06470
 	ld hl, LavenderHouse1Text_1d8f9
 	call PrintText
-.asm_3d208 ; 0x1d8f1
+.asm_3d208
 	jp TextScriptEnd
 
 LavenderHouse1Text_1d8f4: ; 1d8f4 (7:58f4)
@@ -72,7 +72,7 @@ LavenderHouse1Text5: ; 1d918 (7:5918)
 	db $08 ; asm
 	ld a, [wd76c]
 	bit 0, a
-	jr nz, .asm_15ac2 ; 0x1d91e
+	jr nz, .asm_15ac2
 	ld hl, LavenderHouse1Text_1d94c
 	call PrintText
 	ld bc, (POKE_FLUTE << 8) | 1
@@ -82,15 +82,15 @@ LavenderHouse1Text5: ; 1d918 (7:5918)
 	call PrintText
 	ld hl, wd76c
 	set 0, [hl]
-	jr .asm_da749 ; 0x1d939
+	jr .asm_da749
 .BagFull
 	ld hl, FluteNoRoomText
 	call PrintText
-	jr .asm_da749 ; 0x1d941
-.asm_15ac2 ; 0x1d943
+	jr .asm_da749
+.asm_15ac2
 	ld hl, MrFujiAfterFluteText
 	call PrintText
-.asm_da749 ; 0x1d949
+.asm_da749
 	jp TextScriptEnd
 
 LavenderHouse1Text_1d94c: ; 1d94c (7:594c)
-- 
cgit v1.3.1-sl0p