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/mansion1.asm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'scripts/mansion1.asm')

diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm
index 3e067a98..22a87366 100755
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -15,7 +15,7 @@ Mansion1Subscript1: ; 442c5 (11:42c5)
 	ret z
 	ld a, [wd796]
 	bit 0, a
-	jr nz, .asm_442ec ; 0x442d2 $18
+	jr nz, .asm_442ec
 	ld bc, $060c
 	call Mansion1Script_4430b
 	ld bc, $0308
@@ -37,12 +37,12 @@ Mansion1Subscript1: ; 442c5 (11:42c5)
 Mansion1Script_44304: ; 44304 (11:4304)
 	ld a, $2d
 	ld [wd09f], a
-	jr asm_44310
+	jr Mansion1ReplaceBlock
 
 Mansion1Script_4430b: ; 4430b (11:430b)
 	ld a, $e
 	ld [wd09f], a
-asm_44310: ; 44310 (11:4310)
+Mansion1ReplaceBlock: ; 44310 (11:4310)
 	predef ReplaceTileBlock
 	ret
 
@@ -72,10 +72,10 @@ Mansion1TrainerHeader0: ; 44334 (11:4334)
 	db $1 ; flag's bit
 	db ($3 << 4) ; trainer's view range
 	dw wd798 ; flag's byte
-	dw Mansion1BattleText2 ; 0x434b TextBeforeBattle
-	dw Mansion1AfterBattleText2 ; 0x4355 TextAfterBattle
-	dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle
-	dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle
+	dw Mansion1BattleText2 ; TextBeforeBattle
+	dw Mansion1AfterBattleText2 ; TextAfterBattle
+	dw Mansion1EndBattleText2 ; TextEndBattle
+	dw Mansion1EndBattleText2 ; TextEndBattle
 
 	db $ff
 
@@ -104,7 +104,7 @@ Mansion1Text4: ; 4435a (11:435a)
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_4438c ; 0x44368 $22
+	jr nz, .asm_4438c
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd126
@@ -116,9 +116,9 @@ Mansion1Text4: ; 4435a (11:435a)
 	ld hl, wd796
 	bit 0, [hl]
 	set 0, [hl]
-	jr z, .asm_44392 ; 0x44386 $a
+	jr z, .asm_44392
 	res 0, [hl]
-	jr .asm_44392 ; 0x4438a $6
+	jr .asm_44392
 .asm_4438c
 	ld hl, MansionSwitchNotPressedText
 	call PrintText
-- 
cgit v1.3.1-sl0p