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

(limited to 'scripts/lance.asm')

diff --git a/scripts/lance.asm b/scripts/lance.asm
index f2523098..ce8c6cd7 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -60,11 +60,11 @@ LanceScript0: ; 5a305 (16:6305)
 	jp nc, CheckFightingMapTrainers
 	xor a
 	ld [hJoyHeld], a
-	ld a, [wWhichTrade] ; wWhichTrade
+	ld a, [wWhichTrade]
 	cp $3
 	jr nc, .asm_5a325
 	ld a, $1
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	jp DisplayTextID
 .asm_5a325
 	cp $5
@@ -89,11 +89,11 @@ CoordsData_5a33e: ; 5a33e (16:633e)
 
 LanceScript2: ; 5a349 (16:6349)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, LanceScript_5a2f5
 	ld a, $1
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	jp DisplayTextID
 
 LanceScript_5a35b: ; 5a35b (16:635b)
@@ -136,10 +136,10 @@ LanceTrainerHeader0: ; 5a397 (16:6397)
 	db $1 ; flag's bit
 	db ($0 << 4) ; trainer's view range
 	dw wd866 ; flag's byte
-	dw LanceBeforeBattleText ; 0x63ae TextBeforeBattle
-	dw LanceAfterBattleText ; 0x63b8 TextAfterBattle
-	dw LanceEndBattleText ; 0x63b3 TextEndBattle
-	dw LanceEndBattleText ; 0x63b3 TextEndBattle
+	dw LanceBeforeBattleText ; TextBeforeBattle
+	dw LanceAfterBattleText ; TextAfterBattle
+	dw LanceEndBattleText ; TextEndBattle
+	dw LanceEndBattleText ; TextEndBattle
 
 	db $ff
 
-- 
cgit v1.2.3