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, 41 insertions, 41 deletions

diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index b1b1060c..fab2063f 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -12,8 +12,8 @@ CeladonGymScript: ; 4890a (12:490a)
 	ret
 
 CeladonGymScript_48927: ; 48927 (12:4927)
-	ld hl, Gym4CityName ; $4930
-	ld de, Gym4LeaderName ; $493d
+	ld hl, Gym4CityName
+	ld de, Gym4LeaderName
 	jp LoadGymLeaderAndCityName
 
 Gym4CityName: ; 48930 (12:4930)
@@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e)
 	dw CeladonGymScript3
 
 CeladonGymScript3: ; 48956 (12:4956)
-	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
+	ld a, [W_ISINBATTLE]
 	cp $ff
 	jp z, CeladonGymText_48943
 	ld a, $f0
@@ -44,7 +44,7 @@ CeladonGymScript3: ; 48956 (12:4956)
 
 CeladonGymText_48963: ; 48963 (12:4963)
 	ld a, $9
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	ld hl, wd77c
 	set 1, [hl]
@@ -52,14 +52,14 @@ CeladonGymText_48963: ; 48963 (12:4963)
 	call GiveItem
 	jr nc, .BagFull
 	ld a, $a
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 	ld hl, wd77c
 	set 0, [hl]
 	jr .asm_4898c
 .BagFull
 	ld a, $b
-	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
+	ld [H_DOWNARROWBLINKCNT2], a
 	call DisplayTextID
 .asm_4898c
 	ld hl, W_OBTAINEDBADGES
@@ -94,64 +94,64 @@ CeladonGymTrainerHeader0: ; 489bc (12:49bc)
 	db $2 ; flag's bit
 	db ($2 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText2 ; 0x4a8b TextBeforeBattle
-	dw CeladonGymAfterBattleText2 ; 0x4a95 TextAfterBattle
-	dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle
-	dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle
+	dw CeladonGymBattleText2 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText2 ; TextAfterBattle
+	dw CeladonGymEndBattleText2 ; TextEndBattle
+	dw CeladonGymEndBattleText2 ; TextEndBattle
 
 CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
 	db $3 ; flag's bit
 	db ($2 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText3 ; 0x4aa4 TextBeforeBattle
-	dw CeladonGymAfterBattleText3 ; 0x4aae TextAfterBattle
-	dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle
-	dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle
+	dw CeladonGymBattleText3 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText3 ; TextAfterBattle
+	dw CeladonGymEndBattleText3 ; TextEndBattle
+	dw CeladonGymEndBattleText3 ; TextEndBattle
 
 CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
 	db $4 ; flag's bit
 	db ($4 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText4 ; 0x4abd TextBeforeBattle
-	dw CeladonGymAfterBattleText4 ; 0x4ac7 TextAfterBattle
-	dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle
-	dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle
+	dw CeladonGymBattleText4 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText4 ; TextAfterBattle
+	dw CeladonGymEndBattleText4 ; TextEndBattle
+	dw CeladonGymEndBattleText4 ; TextEndBattle
 
 CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
 	db $5 ; flag's bit
 	db ($4 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText5 ; 0x4ad6 TextBeforeBattle
-	dw CeladonGymAfterBattleText5 ; 0x4ae0 TextAfterBattle
-	dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle
-	dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle
+	dw CeladonGymBattleText5 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText5 ; TextAfterBattle
+	dw CeladonGymEndBattleText5 ; TextEndBattle
+	dw CeladonGymEndBattleText5 ; TextEndBattle
 
 CeladonGymTrainerHeader5: ; 489ec (12:49ec)
 	db $6 ; flag's bit
 	db ($2 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText6 ; 0x4aef TextBeforeBattle
-	dw CeladonGymAfterBattleText6 ; 0x4af9 TextAfterBattle
-	dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle
-	dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle
+	dw CeladonGymBattleText6 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText6 ; TextAfterBattle
+	dw CeladonGymEndBattleText6 ; TextEndBattle
+	dw CeladonGymEndBattleText6 ; TextEndBattle
 
 CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
 	db $7 ; flag's bit
 	db ($2 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText7 ; 0x4b08 TextBeforeBattle
-	dw CeladonGymAfterBattleText7 ; 0x4b12 TextAfterBattle
-	dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle
-	dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle
+	dw CeladonGymBattleText7 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText7 ; TextAfterBattle
+	dw CeladonGymEndBattleText7 ; TextEndBattle
+	dw CeladonGymEndBattleText7 ; TextEndBattle
 
 CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
 	db $8 ; flag's bit
 	db ($3 << 4) ; trainer's view range
 	dw wd77c ; flag's byte
-	dw CeladonGymBattleText8 ; 0x4b21 TextBeforeBattle
-	dw CeladonGymAfterBattleText8 ; 0x4b2b TextAfterBattle
-	dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle
-	dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle
+	dw CeladonGymBattleText8 ; TextBeforeBattle
+	dw CeladonGymAfterBattleText8 ; TextAfterBattle
+	dw CeladonGymEndBattleText8 ; TextEndBattle
+	dw CeladonGymEndBattleText8 ; TextEndBattle
 
 	db $ff
 
@@ -159,17 +159,17 @@ CeladonGymText1: ; 48a11 (12:4a11)
 	db $08 ; asm
 	ld a, [wd77c]
 	bit 1, a
-	jr z, .asm_16064 ; 0x48a17
+	jr z, .asm_48a2d
 	bit 0, a
-	jr nz, .asm_3b22c ; 0x48a1b
+	jr nz, .asm_48a25
 	call z, CeladonGymText_48963
 	call DisableWaitingAfterTextDisplay
-	jr .asm_96252 ; 0x48a23
-.asm_3b22c ; 0x48a25
+	jr .asm_48a5b
+.asm_48a25
 	ld hl, CeladonGymText_48a68
 	call PrintText
-	jr .asm_96252 ; 0x48a2b
-.asm_16064 ; 0x48a2d
+	jr .asm_48a5b
+.asm_48a2d
 	ld hl, CeladonGymText_48a5e
 	call PrintText
 	ld hl, wd72d
@@ -187,7 +187,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
 	ld a, $3
 	ld [W_CELADONGYMCURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
-.asm_96252 ; 0x48a5b
+.asm_48a5b
 	jp TextScriptEnd
 
 CeladonGymText_48a5e: ; 48a5e (12:4a5e)