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

(limited to 'scripts/lorelei.asm')

diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index e82497ef..ee50849b 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -41,7 +41,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb)
 
 LoreleiScript4: ; 761c5 (1d:61c5)
 	ret
-asm_761c6: ; 761c6 (1d:61c6)
+
+LoreleiScript_761c6: ; 761c6 (1d:61c6)
 	ld hl, wSimulatedJoypadStatesEnd
 	ld a, D_UP
 	ld [hli], a
@@ -57,6 +58,7 @@ asm_761c6: ; 761c6 (1d:61c6)
 	ld [W_LORELEICURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
 	ret
+
 LoreleiScript0: ; 761e2 (1d:61e2)
 	ld hl, CoordsData_76223
 	call ArePlayerCoordsInArray
@@ -66,16 +68,16 @@ LoreleiScript0: ; 761e2 (1d:61e2)
 	ld [hJoyHeld], a
 	ld [wSimulatedJoypadStatesEnd], a
 	ld [wSimulatedJoypadStatesIndex], a
-	ld a, [wWhichTrade] ; wWhichTrade
+	ld a, [wWhichTrade]
 	cp $3
 	jr c, .asm_76206
 	ld hl, wd863
 	bit 6, [hl]
 	set 6, [hl]
-	jr z, asm_761c6
+	jr z, LoreleiScript_761c6
 .asm_76206
 	ld a, $2
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	ld a, D_UP
 	ld [wSimulatedJoypadStatesEnd], a
@@ -106,11 +108,11 @@ LoreleiScript3: ; 7622c (1d:622c)
 	ret
 LoreleiScript2: ; 7623f (1d:623f)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, LoreleiScript_761b6
 	ld a, $1
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	jp DisplayTextID
 
 LoreleiTextPointers: ; 76251 (1d:6251)
@@ -122,10 +124,10 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255)
 	db $1 ; flag's bit
 	db ($0 << 4) ; trainer's view range
 	dw wd863 ; flag's byte
-	dw LoreleiBeforeBattleText ; 0x626c TextBeforeBattle
-	dw LoreleiAfterBattleText ; 0x6276 TextAfterBattle
-	dw LoreleiEndBattleText ; 0x6271 TextEndBattle
-	dw LoreleiEndBattleText ; 0x6271 TextEndBattle
+	dw LoreleiBeforeBattleText ; TextBeforeBattle
+	dw LoreleiAfterBattleText ; TextAfterBattle
+	dw LoreleiEndBattleText ; TextEndBattle
+	dw LoreleiEndBattleText ; TextEndBattle
 
 	db $ff
 
-- 
cgit v1.2.3