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

diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm
index bbddad79..32c4868a 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -38,15 +38,15 @@ CeruleanCityScript4: ; 194a7 (6:54a7)
 CeruleanCityScript0: ; 194c8 (6:54c8)
 	ld a, [wd75b]
 	bit 7, a
-	jr nz, .asm_194f7 ; 0x194cd $28
+	jr nz, .asm_194f7
 	ld hl, CeruleanCityCoords1
 	call ArePlayerCoordsInArray
-	jr nc, .asm_194f7 ; 0x194d5 $20
+	jr nc, .asm_194f7
 	ld a, [wWhichTrade]
 	cp $1
 	ld a, $8
 	ld b, $0
-	jr nz, .asm_194e6 ; 0x194e0 $4
+	jr nz, .asm_194e6
 	ld a, $4
 	ld b, $4
 .asm_194e6
@@ -66,7 +66,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 	ret nc
 	ld a, [wWalkBikeSurfState]
 	and a
-	jr z, .asm_19512 ; 0x19508 $8
+	jr z, .asm_19512
 	ld a, $ff
 	ld [wc0ee], a
 	call PlaySound
@@ -80,7 +80,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 	ld [wJoyIgnore], a
 	ld a, [W_XCOORD]
 	cp $14
-	jr z, .asm_19535 ; 0x19526 $d
+	jr z, .asm_19535
 	ld a, $1
 	ld [$ff8c], a
 	ld a, $5
@@ -140,12 +140,12 @@ CeruleanCityScript1: ; 19567 (6:5567)
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
 	cp STARTER2
-	jr nz, .NotSquirtle ; 0x19592 $4
+	jr nz, .NotSquirtle
 	ld a, $7
 	jr .done
 .NotSquirtle
 	cp STARTER3
-	jr nz, .Charmander ; 0x1959a $4
+	jr nz, .Charmander
 	ld a, $8
 	jr .done
 .Charmander
@@ -181,9 +181,9 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
 	call SetSpriteMovementBytesToFF
 	ld a, [W_XCOORD]
 	cp $14
-	jr nz, .asm_195f0 ; 0x195e9 $5
+	jr nz, .asm_195f0
 	ld de, CeruleanCityMovement4
-	jr .asm_195f3 ; 0x195ee $3
+	jr .asm_195f3
 .asm_195f0
 	ld de, CeruleanCityMovement3
 .asm_195f3
@@ -242,11 +242,11 @@ CeruleanCityText1: ; 1964f (6:564f)
 	; or talk about bill
 	ld hl, CeruleanCityText_19677
 	call PrintText
-	jr .end ; 0x1965d
-.PreBattleText ; 0x1965f
+	jr .end
+.PreBattleText
 	ld hl, CeruleanCityText_19668
 	call PrintText
-.end ; 0x19665
+.end
 	jp TextScriptEnd
 
 CeruleanCityText_19668: ; 19668 (6:5668)
@@ -269,7 +269,7 @@ CeruleanCityText2: ; 1967c (6:567c)
 	db $8
 	ld a, [wd75b]
 	bit 7, a
-	jr nz, .asm_4ca20 ; 0x19682 $29
+	jr nz, .asm_4ca20
 	ld hl, CeruleanCityText_196d9
 	call PrintText
 	ld hl, wd72d
@@ -285,7 +285,7 @@ CeruleanCityText2: ; 1967c (6:567c)
 	ld a, $4
 	ld [W_CERULEANCITYCURSCRIPT], a
 	jp TextScriptEnd
-.asm_4ca20 ; 0x196ad
+.asm_4ca20
 	ld hl, CeruleanCityText_196f3
 	call PrintText
 	ld bc, (TM_28 << 8) + 1
@@ -299,7 +299,7 @@ CeruleanCityText2: ; 1967c (6:567c)
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, ReceivedTM28Text
 	call PrintText
-	callba Func_74872
+	callba CeruleanHideRocket
 .Done
 	jp TextScriptEnd
 
@@ -346,20 +346,20 @@ CeruleanCityText7: ; 1970c (6:570c)
 	db $08 ; asm
 	ldh a, [$d3]
 	cp $b4
-	jr c, .asm_e9fc9 ; 0x19711
+	jr c, .asm_e9fc9
 	ld hl, CeruleanCityText_19730
 	call PrintText
-	jr .asm_d486e ; 0x19719
-.asm_e9fc9 ; 0x1971b
+	jr .asm_d486e
+.asm_e9fc9
 	cp $64
-	jr c, .asm_df99b ; 0x1971d
+	jr c, .asm_df99b
 	ld hl, CeruleanCityText_19735
 	call PrintText
-	jr .asm_d486e ; 0x19725
-.asm_df99b ; 0x19727
+	jr .asm_d486e
+.asm_df99b
 	ld hl, CeruleanCityText_1973a
 	call PrintText
-.asm_d486e ; 0x1972d
+.asm_d486e
 	jp TextScriptEnd
 
 CeruleanCityText_19730: ; 19730 (6:5730)
@@ -376,28 +376,28 @@ CeruleanCityText_1973a: ; 1973a (6:573a)
 
 CeruleanCityText8: ; 1973f (6:573f)
 	db $08 ; asm
-	ldh a, [$d3]
+	ld a, [hRandomAdd]
 	cp $b4
-	jr c, .asm_e28da ; 0x19744
+	jr c, .asm_e28da
 	ld hl, CeruleanCityText_1976f
 	call PrintText
-	jr .asm_f2f38 ; 0x1974c
-.asm_e28da ; 0x1974e
+	jr .asm_f2f38
+.asm_e28da
 	cp $78
-	jr c, .asm_15d08 ; 0x19750
+	jr c, .asm_15d08
 	ld hl, CeruleanCityText_19774
 	call PrintText
-	jr .asm_f2f38 ; 0x19758
-.asm_15d08 ; 0x1975a
+	jr .asm_f2f38
+.asm_15d08
 	cp $3c
-	jr c, .asm_d7fea ; 0x1975c
+	jr c, .asm_d7fea
 	ld hl, CeruleanCityText_19779
 	call PrintText
-	jr .asm_f2f38 ; 0x19764
-.asm_d7fea ; 0x19766
+	jr .asm_f2f38
+.asm_d7fea
 	ld hl, CeruleanCityText_1977e
 	call PrintText
-.asm_f2f38 ; 0x1976c
+.asm_f2f38
 	jp TextScriptEnd
 
 CeruleanCityText_1976f: ; 1976f (6:576f)