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

(limited to 'scripts/mansion2.asm')

diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index c643d229..fdc1ec18 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -69,10 +69,10 @@ Mansion2TrainerHeader0: ; 52057 (14:6057)
 	db $1 ; flag's bit
 	db ($0 << 4) ; trainer's view range
 	dw wd847 ; flag's byte
-	dw Mansion2BattleText1 ; 0x606e TextBeforeBattle
-	dw Mansion2AfterBattleText1 ; 0x6078 TextAfterBattle
-	dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle
-	dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle
+	dw Mansion2BattleText1 ; TextBeforeBattle
+	dw Mansion2AfterBattleText1 ; TextAfterBattle
+	dw Mansion2EndBattleText1 ; TextEndBattle
+	dw Mansion2EndBattleText1 ; TextEndBattle
 
 	db $ff
 
@@ -110,7 +110,7 @@ Mansion2Text5: ; 52087 (14:6087)
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_520b9 ; 0x52095 $22
+	jr nz, .asm_520b9
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd126
@@ -122,9 +122,9 @@ Mansion2Text5: ; 52087 (14:6087)
 	ld hl, wd796
 	bit 0, [hl]
 	set 0, [hl]
-	jr z, .asm_520bf ; 0x520b3 $a
+	jr z, .asm_520bf
 	res 0, [hl]
-	jr .asm_520bf ; 0x520b7 $6
+	jr .asm_520bf
 .asm_520b9
 	ld hl, Mansion2Text_520cc
 	call PrintText
-- 
cgit v1.3.1-sl0p