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

1 files changed, 31 insertions, 31 deletions

diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 23eb795c..e6d9bcac 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -13,7 +13,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
-	ld hl, DataTable_51bc1 ; $5bc1
+	ld hl, DataTable_51bc1
 	call SilphCo7Text_51bc8
 	call SilphCo7Text_51bf4
 	ld a, [wd830]
@@ -136,20 +136,20 @@ SilphCo7Script0: ; 51c23 (14:5c23)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call SetSpriteMovementBytesToFF
 	ld de, MovementData_51c7d
-	ld a, [wWhichTrade] ; wWhichTrade
+	ld a, [wWhichTrade]
 	ld [wcf0d], a
 	cp $1
 	jr z, .asm_51c6c
 	inc de
 .asm_51c6c
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call MoveSprite
 	ld a, $3
 	jp SilphCo7Text_51c10
@@ -169,18 +169,18 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $d
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	call Delay3
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, SilphCo7Text14 ; $5ec8
-	ld de, SilphCo7Text_51ecd ; $5ecd
+	ld hl, SilphCo7Text14
+	ld de, SilphCo7Text_51ecd
 	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
-	ld [W_CUROPPONENT], a ; wd059
-	ld a, [W_RIVALSTARTER] ; wd715
+	ld [W_CUROPPONENT], a
+	ld a, [W_RIVALSTARTER]
 	cp STARTER2
 	jr nz, .asm_51cb6
 	ld a, $7
@@ -193,12 +193,12 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 .asm_51cbe
 	ld a, $9
 .asm_51cc0
-	ld [W_TRAINERNO], a ; wd05d
+	ld [W_TRAINERNO], a
 	ld a, $4
 	jp SilphCo7Text_51c10
 
 SilphCo7Script4: ; 51cc8 (14:5cc8)
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, SilphCo7Text_51c0c
 	ld a, $f0
@@ -208,12 +208,12 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
 	ld a, $4
 	ld [wd528], a
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	ld a, $4
 	ld [$ff8d], a
 	call SetSpriteFacingDirectionAndDelay
 	ld a, $f
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	ld a, $ff
 	ld [wc0ee], a
@@ -226,7 +226,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
 	ld de, MovementData_51d1a
 .asm_51d0e
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call MoveSprite
 	ld a, $5
 	jp SilphCo7Text_51c10
@@ -271,37 +271,37 @@ SilphCo7TrainerHeader0: ; 51d5d (14:5d5d)
 	db $5 ; flag's bit
 	db ($2 << 4) ; trainer's view range
 	dw wd82f ; flag's byte
-	dw SilphCo7BattleText1 ; 0x5e5a TextBeforeBattle
-	dw SilphCo7AfterBattleText1 ; 0x5e64 TextAfterBattle
-	dw SilphCo7EndBattleText1 ; 0x5e5f TextEndBattle
-	dw SilphCo7EndBattleText1 ; 0x5e5f TextEndBattle
+	dw SilphCo7BattleText1 ; TextBeforeBattle
+	dw SilphCo7AfterBattleText1 ; TextAfterBattle
+	dw SilphCo7EndBattleText1 ; TextEndBattle
+	dw SilphCo7EndBattleText1 ; TextEndBattle
 
 SilphCo7TrainerHeader2: ; 51d69 (14:5d69)
 	db $6 ; flag's bit
 	db ($3 << 4) ; trainer's view range
 	dw wd82f ; flag's byte
-	dw SilphCo7BattleText2 ; 0x5e73 TextBeforeBattle
-	dw SilphCo7AfterBattleText2 ; 0x5e7d TextAfterBattle
-	dw SilphCo7EndBattleText2 ; 0x5e78 TextEndBattle
-	dw SilphCo7EndBattleText2 ; 0x5e78 TextEndBattle
+	dw SilphCo7BattleText2 ; TextBeforeBattle
+	dw SilphCo7AfterBattleText2 ; TextAfterBattle
+	dw SilphCo7EndBattleText2 ; TextEndBattle
+	dw SilphCo7EndBattleText2 ; TextEndBattle
 
 SilphCo7TrainerHeader3: ; 51d75 (14:5d75)
 	db $7 ; flag's bit
 	db ($3 << 4) ; trainer's view range
 	dw wd82f ; flag's byte
-	dw SilphCo7BattleText3 ; 0x5e8c TextBeforeBattle
-	dw SilphCo7AfterBattleText3 ; 0x5e96 TextAfterBattle
-	dw SilphCo7EndBattleText3 ; 0x5e91 TextEndBattle
-	dw SilphCo7EndBattleText3 ; 0x5e91 TextEndBattle
+	dw SilphCo7BattleText3 ; TextBeforeBattle
+	dw SilphCo7AfterBattleText3 ; TextAfterBattle
+	dw SilphCo7EndBattleText3 ; TextEndBattle
+	dw SilphCo7EndBattleText3 ; TextEndBattle
 
 SilphCo7TrainerHeader4: ; 51d81 (14:5d81)
 	db $8 ; flag's bit
 	db ($4 << 4) ; trainer's view range
 	dw wd82f ; flag's byte
-	dw SilphCo7BattleText4 ; 0x5ea5 TextBeforeBattle
-	dw SilphCo7AfterBattleText4 ; 0x5eaf TextAfterBattle
-	dw SilphCo7EndBattleText4 ; 0x5eaa TextEndBattle
-	dw SilphCo7EndBattleText4 ; 0x5eaa TextEndBattle
+	dw SilphCo7BattleText4 ; TextBeforeBattle
+	dw SilphCo7AfterBattleText4 ; TextAfterBattle
+	dw SilphCo7EndBattleText4 ; TextEndBattle
+	dw SilphCo7EndBattleText4 ; TextEndBattle
 
 	db $ff