Clean up script labels in marts and Pokémon Centers.

27 files changed, 276 insertions, 278 deletions

diff --git a/scripts/celadonmart1.asm b/scripts/celadonmart1.asm
index 041af8b3..0f67972b 100755
--- a/scripts/celadonmart1.asm
+++ b/scripts/celadonmart1.asm
@@ -1,19 +1,19 @@
-CeladonMart1Script: ; 60f86 (18:4f86)
+CeladonMart1Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart1TextPointers: ; 60f89 (18:4f89)
+CeladonMart1TextPointers:
 	dw CeladonMart1Text1
 	dw CeladonMart1Text2
 	dw CeladonMart1Text3
 
-CeladonMart1Text1: ; 60f8f (18:4f8f)
+CeladonMart1Text1:
 	TX_FAR _CeladonMart1Text1
 	db "@"
 
-CeladonMart1Text2: ; 60f94 (18:4f94)
+CeladonMart1Text2:
 	TX_FAR _CeladonMart1Text2
 	db "@"
 
-CeladonMart1Text3: ; 60f99 (18:4f99)
+CeladonMart1Text3:
 	TX_FAR _CeladonMart1Text3
 	db "@"
diff --git a/scripts/celadonmart2.asm b/scripts/celadonmart2.asm
index 92f04399..c438d6e1 100755
--- a/scripts/celadonmart2.asm
+++ b/scripts/celadonmart2.asm
@@ -1,21 +1,21 @@
-CeladonMart2Script: ; 560f5 (15:60f5)
+CeladonMart2Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart2TextPointers: ; 560f8 (15:60f8)
-	dw CeladonMart2Text1
-	dw CeladonMart2Text2
+CeladonMart2TextPointers:
+	dw CeladonMart2Clerk1Text
+	dw CeladonMart2Clerk2Text
 	dw CeladonMart2Text3
 	dw CeladonMart2Text4
 	dw CeladonMart2Text5
 
-CeladonMart2Text3: ; 56102 (15:6102)
+CeladonMart2Text3:
 	TX_FAR _CeladonMart2Text3
 	db "@"
 
-CeladonMart2Text4: ; 56107 (15:6107)
+CeladonMart2Text4:
 	TX_FAR _CeladonMart2Text4
 	db "@"
 
-CeladonMart2Text5: ; 5610c (15:610c)
+CeladonMart2Text5:
 	TX_FAR _CeladonMart2Text5
 	db "@"
diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm
index c6c6ecc7..7b9940fa 100755
--- a/scripts/celadonmart3.asm
+++ b/scripts/celadonmart3.asm
@@ -1,7 +1,7 @@
-CeladonMart3Script: ; 48225 (12:4225)
+CeladonMart3Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart3TextPointers: ; 48228 (12:4228)
+CeladonMart3TextPointers:
 	dw CeladonMart3Text1
 	dw CeladonMart3Text2
 	dw CeladonMart3Text3
@@ -20,7 +20,7 @@ CeladonMart3TextPointers: ; 48228 (12:4228)
 	dw CeladonMart3Text16
 	dw CeladonMart3Text17
 
-CeladonMart3Text1: ; 4824a (12:424a)
+CeladonMart3Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_TM18
 	jr nz, .asm_a5463
@@ -41,67 +41,67 @@ CeladonMart3Text1: ; 4824a (12:424a)
 	call PrintText
 	jp TextScriptEnd
 
-TM18PreReceiveText: ; 48278 (12:4278)
+TM18PreReceiveText:
 	TX_FAR _TM18PreReceiveText
 	db "@"
 
-ReceivedTM18Text: ; 4827d (12:427d)
+ReceivedTM18Text:
 	TX_FAR _ReceivedTM18Text
 	db $0B, "@"
 
-TM18ExplanationText: ; 48283 (12:4283)
+TM18ExplanationText:
 	TX_FAR _TM18ExplanationText
 	db "@"
 
-TM18NoRoomText: ; 48288 (12:4288)
+TM18NoRoomText:
 	TX_FAR _TM18NoRoomText
 	db "@"
 
-CeladonMart3Text2: ; 4828d (12:428d)
+CeladonMart3Text2:
 	TX_FAR _CeladonMart3Text2
 	db "@"
 
-CeladonMart3Text3: ; 48292 (12:4292)
+CeladonMart3Text3:
 	TX_FAR _CeladonMart3Text3
 	db "@"
 
-CeladonMart3Text4: ; 48297 (12:4297)
+CeladonMart3Text4:
 	TX_FAR _CeladonMart3Text4
 	db "@"
 
-CeladonMart3Text5: ; 4829c (12:429c)
+CeladonMart3Text5:
 	TX_FAR _CeladonMart3Text5
 	db "@"
 
 CeladonMart3Text12
-CeladonMart3Text10: ; 482a1 (12:42a1)
-CeladonMart3Text8: ; 482a1 (12:42a1)
-CeladonMart3Text6: ; 482a1 (12:42a1)
+CeladonMart3Text10:
+CeladonMart3Text8:
+CeladonMart3Text6:
 	TX_FAR _CeladonMart3Text6
 	db "@"
 
-CeladonMart3Text7: ; 482a6 (12:42a6)
+CeladonMart3Text7:
 	TX_FAR _CeladonMart3Text7
 	db "@"
 
-CeladonMart3Text9: ; 482ab (12:42ab)
+CeladonMart3Text9:
 	TX_FAR _CeladonMart3Text9
 	db "@"
 
-CeladonMart3Text11: ; 482b0 (12:42b0)
+CeladonMart3Text11:
 	TX_FAR _CeladonMart3Text11
 	db "@"
 
-CeladonMart3Text13: ; 482b5 (12:42b5)
+CeladonMart3Text13:
 	TX_FAR _CeladonMart3Text13
 	db "@"
 
-CeladonMart3Text14: ; 482ba (12:42ba)
+CeladonMart3Text14:
 	TX_FAR _CeladonMart3Text14
 	db "@"
 
-CeladonMart3Text17: ; 482bf (12:42bf)
-CeladonMart3Text16: ; 482bf (12:42bf)
-CeladonMart3Text15: ; 482bf (12:42bf)
+CeladonMart3Text17:
+CeladonMart3Text16:
+CeladonMart3Text15:
 	TX_FAR _CeladonMart3Text15
 	db "@"
diff --git a/scripts/celadonmart4.asm b/scripts/celadonmart4.asm
index dfe2b90a..18049dc0 100755
--- a/scripts/celadonmart4.asm
+++ b/scripts/celadonmart4.asm
@@ -1,20 +1,20 @@
-CeladonMart4Script: ; 48356 (12:4356)
+CeladonMart4Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart4TextPointers: ; 48359 (12:4359)
-	dw CeladonMart4Text1
+CeladonMart4TextPointers:
+	dw CeladonMart4ClerkText
 	dw CeladonMart4Text2
 	dw CeladonMart4Text3
 	dw CeladonMart4Text4
 
-CeladonMart4Text2: ; 48361 (12:4361)
+CeladonMart4Text2:
 	TX_FAR _CeladonMart4Text2
 	db "@"
 
-CeladonMart4Text3: ; 48366 (12:4366)
+CeladonMart4Text3:
 	TX_FAR _CeladonMart4Text3
 	db "@"
 
-CeladonMart4Text4: ; 4836b (12:436b)
+CeladonMart4Text4:
 	TX_FAR _CeladonMart4Text4
 	db "@"
diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm
index 9bd7f991..7b7371a7 100755
--- a/scripts/celadonmart5.asm
+++ b/scripts/celadonmart5.asm
@@ -1,21 +1,21 @@
-CeladonMart5Script: ; 49069 (12:5069)
+CeladonMart5Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart5TextPointers: ; 4906c (12:506c)
+CeladonMart5TextPointers:
 	dw CeladonMart5Text1
 	dw CeladonMart5Text2
-	dw CeladonMart5Text3
-	dw CeladonMart5Text4
+	dw CeladonMart5Clerk1Text
+	dw CeladonMart5Clerk2Text
 	dw CeladonMart5Text5
 
-CeladonMart5Text1: ; 49076 (12:5076)
+CeladonMart5Text1:
 	TX_FAR _CeladonMart5Text1
 	db "@"
 
-CeladonMart5Text2: ; 4907b (12:507b)
+CeladonMart5Text2:
 	TX_FAR _CeladonMart5Text2
 	db "@"
 
-CeladonMart5Text5: ; 49080 (12:5080)
+CeladonMart5Text5:
 	TX_FAR _CeladonMart5Text5
 	db "@"
diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm
index e693d9fe..60e5210c 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorScript: ; 48600 (12:4600)
+CeladonMartElevatorScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -14,7 +14,7 @@ CeladonMartElevatorScript: ; 48600 (12:4600)
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
+CeladonMartElevatorScript_4861c:
 	ld hl, wWarpEntries
 	ld a, [wWarpedFromWhichWarp]
 	ld b, a
@@ -22,7 +22,7 @@ CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
 	ld c, a
 	call CeladonMartElevatorScript_4862a
 
-CeladonMartElevatorScript_4862a: ; 4862a (12:462a)
+CeladonMartElevatorScript_4862a:
 	inc hl
 	inc hl
 	ld a, b
@@ -31,24 +31,24 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a)
 	ld [hli], a
 	ret
 
-CeladonMartElevatorScript_48631: ; 48631 (12:4631)
-	ld hl, CeladonMartElavatorFloors
+CeladonMartElevatorScript_48631:
+	ld hl, CeladonMartElevatorFloors
 	call LoadItemList
-	ld hl, CeldaonMartElevatorWarpMaps
+	ld hl, CeladonMartElevatorWarpMaps
 	ld de, wElevatorWarpMaps
-	ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps
+	ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps
 	jp CopyData
 
-CeladonMartElavatorFloors: ; 48643 (12:4643)
-	db $05 ; num elements in list
+CeladonMartElevatorFloors:
+	db 5 ; number of elements in list
 	db FLOOR_1F
 	db FLOOR_2F
 	db FLOOR_3F
 	db FLOOR_4F
 	db FLOOR_5F
-	db $FF ; terminator
+	db $FF
 
-CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
+CeladonMartElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
@@ -57,17 +57,17 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
 	db $02, CELADON_MART_3
 	db $02, CELADON_MART_4
 	db $02, CELADON_MART_5
-CeldaonMartElevatorWarpMapsEnd:
+CeladonMartElevatorWarpMapsEnd:
 
-CeladonMartElevatorScript_48654: ; 48654 (12:4654)
+CeladonMartElevatorScript_48654:
 	jpba ShakeElevator
 
-CeladonMartElevatorTextPointers: ; 4865c (12:465c)
+CeladonMartElevatorTextPointers:
 	dw CeladonMartElevatorText1
 
-CeladonMartElevatorText1: ; 4865e (12:465e)
+CeladonMartElevatorText1:
 	TX_ASM
 	call CeladonMartElevatorScript_48631
-	ld hl, CeldaonMartElevatorWarpMaps
+	ld hl, CeladonMartElevatorWarpMaps
 	predef DisplayElevatorFloorMenu
 	jp TextScriptEnd
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index 439ab62e..d00fb0b5 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -1,7 +1,7 @@
-CeladonMartRoofScript: ; 483d5 (12:43d5)
+CeladonMartRoofScript:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8)
+CeladonMartRoofScript_GetDrinksInBag:
 ; construct a list of all drinks in the player's bag
 	xor a
 	ld [wFilteredBagItemsCount], a
@@ -34,13 +34,13 @@ CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8)
 	ld [de], a
 	ret
 
-CeladonMartRoofDrinkList: ; 48408 (12:4408)
+CeladonMartRoofDrinkList:
 	db FRESH_WATER
 	db SODA_POP
 	db LEMONADE
 	db $00
 
-CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
+CeladonMartRoofScript_GiveDrinkToGirl:
 	ld hl, wd730
 	set 6, [hl]
 	ld hl, CeladonMartRoofText_484ee
@@ -130,60 +130,60 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
 	ld hl, CeladonMartRoofText_4852c
 	jp PrintText
 
-RemoveItemByIDBank12: ; 484e6 (12:44e6)
+RemoveItemByIDBank12:
 	jpba RemoveItemByID
 
-CeladonMartRoofText_484ee: ; 484ee (12:44ee)
+CeladonMartRoofText_484ee:
 	TX_FAR _CeladonMartRoofText_484ee
 	db "@"
 
-CeladonMartRoofText_484f3: ; 484f3 (12:44f3)
+CeladonMartRoofText_484f3:
 	TX_FAR _CeladonMartRoofText_484f3
 	db $0d
 	db "@"
 
-CeladonMartRoofText_484f9: ; 484f9 (12:44f9)
+CeladonMartRoofText_484f9:
 	TX_FAR _CeladonMartRoofText_484f9
 	db $0b
 	TX_FAR _CeladonMartRoofText_484fe
 	db $0d
 	db "@"
 
-CeladonMartRoofText_48504: ; 48504 (12:4504)
+CeladonMartRoofText_48504:
 	TX_FAR _CeladonMartRoofText_48504
 	db $0d
 	db "@"
 
-CeladonMartRoofText_4850a: ; 4850a (12:450a)
+CeladonMartRoofText_4850a:
 	TX_FAR _CeladonMartRoofText_4850a
 	db $0b
 	TX_FAR _CeladonMartRoofText_4850f
 	db $0d
 	db "@"
 
-CeladonMartRoofText_48515: ; 48515 (12:4515)
+CeladonMartRoofText_48515:
 	TX_FAR _CeladonMartRoofText_48515
 	db $0d
 	db "@"
 
-ReceivedTM49Text: ; 4851b (12:451b)
+ReceivedTM49Text:
 	TX_FAR _ReceivedTM49Text
 	db $0b
 	TX_FAR _CeladonMartRoofText_48520
 	db $0d
 	db "@"
 
-CeladonMartRoofText_48526: ; 48526 (12:4526)
+CeladonMartRoofText_48526:
 	TX_FAR _CeladonMartRoofText_48526
 	db $0d
 	db "@"
 
-CeladonMartRoofText_4852c: ; 4852c (12:452c)
+CeladonMartRoofText_4852c:
 	TX_FAR _CeladonMartRoofText_4852c
 	db $0d
 	db "@"
 
-CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532)
+CeladonMartRoofScript_PrintDrinksInBag:
 	ld hl, wFilteredBagItems
 	xor a
 	ld [hItemCounter], a
@@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532)
 	pop hl
 	jr .loop
 
-CeladonMartRoofTextPointers: ; 4855b (12:455b)
+CeladonMartRoofTextPointers:
 	dw CeladonMartRoofText1
 	dw CeladonMartRoofText2
 	dw CeladonMartRoofText5
@@ -213,11 +213,11 @@ CeladonMartRoofTextPointers: ; 4855b (12:455b)
 	dw CeladonMartRoofText5
 	dw CeladonMartRoofText6
 
-CeladonMartRoofText1: ; 48567 (12:4567)
+CeladonMartRoofText1:
 	TX_FAR _CeladonMartRoofText1
 	db "@"
 
-CeladonMartRoofText2: ; 4856c (12:456c)
+CeladonMartRoofText2:
 	TX_ASM
 	call CeladonMartRoofScript_GetDrinksInBag
 	ld a, [wFilteredBagItemsCount]
@@ -239,17 +239,17 @@ CeladonMartRoofText2: ; 4856c (12:456c)
 .done
 	jp TextScriptEnd
 
-CeladonMartRoofText3: ; 48598 (12:4598)
+CeladonMartRoofText3:
 	TX_FAR _CeladonMartRoofText_48598
 	db "@"
 
-CeladonMartRoofText4: ; 4859d (12:459d)
+CeladonMartRoofText4:
 	TX_FAR _CeladonMartRoofText4
 	db "@"
 
-CeladonMartRoofText5: ; 485a2 (12:45a2)
+CeladonMartRoofText5:
 	db $f5
 
-CeladonMartRoofText6: ; 485a3 (12:45a3)
+CeladonMartRoofText6:
 	TX_FAR _CeladonMartRoofText6
 	db "@"
diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm
index 1b8d3a1b..024a4ec3 100755
--- a/scripts/celadonpokecenter.asm
+++ b/scripts/celadonpokecenter.asm
@@ -1,23 +1,23 @@
-CeladonPokecenterScript: ; 488b8 (12:48b8)
+CeladonPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeladonPokecenterTextPointers: ; 488be (12:48be)
-	dw CeladonPokecenterText1
+CeladonPokecenterTextPointers:
+	dw CeladonHealNurseText
 	dw CeladonPokecenterText2
 	dw CeladonPokecenterText3
-	dw CeladonPokecenterText4
+	dw CeladonTradeNurseText
 
-CeladonPokecenterText4: ; 488c6 (12:48c6)
+CeladonTradeNurseText:
 	db $f6
 
-CeladonPokecenterText1: ; 488c7 (12:48c7)
+CeladonHealNurseText:
 	db $ff
 
-CeladonPokecenterText2: ; 488c8 (12:48c8)
+CeladonPokecenterText2:
 	TX_FAR _CeladonPokecenterText2
 	db "@"
 
-CeladonPokecenterText3: ; 488cd (12:48cd)
+CeladonPokecenterText3:
 	TX_FAR _CeladonPokecenterText3
 	db "@"
diff --git a/scripts/ceruleanmart.asm b/scripts/ceruleanmart.asm
index 7aea6d47..76d83f90 100755
--- a/scripts/ceruleanmart.asm
+++ b/scripts/ceruleanmart.asm
@@ -1,15 +1,15 @@
-CeruleanMartScript: ; 5c895 (17:4895)
+CeruleanMartScript:
 	jp EnableAutoTextBoxDrawing
 
-CeruleanMartTextPointers: ; 5c898 (17:4898)
-	dw CeruleanMartText1
+CeruleanMartTextPointers:
+	dw CeruleanCashierText
 	dw CeruleanMartText2
 	dw CeruleanMartText3
 
-CeruleanMartText2: ; 5c89e (17:489e)
+CeruleanMartText2:
 	TX_FAR _CeruleanMartText2
 	db "@"
 
-CeruleanMartText3: ; 5c8a3 (17:48a3)
+CeruleanMartText3:
 	TX_FAR _CeruleanMartText3
 	db "@"
diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm
index 5d888317..cb18da01 100755
--- a/scripts/ceruleanpokecenter.asm
+++ b/scripts/ceruleanpokecenter.asm
@@ -1,23 +1,23 @@
-CeruleanPokecenterScript: ; 5c645 (17:4645)
+CeruleanPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeruleanPokecenterTextPointers: ; 5c64b (17:464b)
-	dw CeruleanPokecenterText1
+CeruleanPokecenterTextPointers:
+	dw CeruleanHealNurseText
 	dw CeruleanPokecenterText2
 	dw CeruleanPokecenterText3
-	dw CeruleanPokecenterText4
+	dw CeruleanTradeNurseText
 
-CeruleanPokecenterText4: ; 5c653 (17:4653)
+CeruleanTradeNurseText:
 	db $f6
 
-CeruleanPokecenterText1: ; 5c654 (17:4654)
+CeruleanHealNurseText:
 	db $ff
 
-CeruleanPokecenterText2: ; 5c655 (17:4655)
-	TX_FAR _CeruleanPokecenterText1
+CeruleanPokecenterText2:
+	TX_FAR _CeruleanPokecenterText2
 	db "@"
 
-CeruleanPokecenterText3: ; 5c65a (17:465a)
+CeruleanPokecenterText3:
 	TX_FAR _CeruleanPokecenterText3
 	db "@"
diff --git a/scripts/cinnabarmart.asm b/scripts/cinnabarmart.asm
index 2abd7b67..55b82cf0 100755
--- a/scripts/cinnabarmart.asm
+++ b/scripts/cinnabarmart.asm
@@ -1,15 +1,15 @@
-CinnabarMartScript: ; 75e7e (1d:5e7e)
+CinnabarMartScript:
 	jp EnableAutoTextBoxDrawing
 
-CinnabarMartTextPointers: ; 75e81 (1d:5e81)
-	dw CinnabarMartText1
+CinnabarMartTextPointers:
+	dw CinnabarCashierText
 	dw CinnabarMartText2
 	dw CinnabarMartText3
 
-CinnabarMartText2: ; 75e87 (1d:5e87)
+CinnabarMartText2:
 	TX_FAR _CinnabarMartText2
 	db "@"
 
-CinnabarMartText3: ; 75e8c (1d:5e8c)
+CinnabarMartText3:
 	TX_FAR _CinnabarMartText3
 	db "@"
diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm
index abae9d8d..3835f3d6 100755
--- a/scripts/cinnabarpokecenter.asm
+++ b/scripts/cinnabarpokecenter.asm
@@ -1,23 +1,23 @@
-CinnabarPokecenterScript: ; 75e2c (1d:5e2c)
+CinnabarPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32)
-	dw CinnabarPokecenterText1
+CinnabarPokecenterTextPointers:
+	dw CinnabarHealNurseText
 	dw CinnabarPokecenterText2
 	dw CinnabarPokecenterText3
-	dw CinnabarPokecenterText4
+	dw CinnabarTradeNurseText
 
-CinnabarPokecenterText1: ; 75e3a (1d:5e3a)
+CinnabarHealNurseText:
 	db $ff
 
-CinnabarPokecenterText2: ; 75e3b (1d:5e3b)
-	TX_FAR _CinnabarPokecenterText1
+CinnabarPokecenterText2:
+	TX_FAR _CinnabarPokecenterText2
 	db "@"
 
-CinnabarPokecenterText3: ; 75e40 (1d:5e40)
+CinnabarPokecenterText3:
 	TX_FAR _CinnabarPokecenterText3
 	db "@"
 
-CinnabarPokecenterText4: ; 75e45 (1d:5e45)
+CinnabarTradeNurseText:
 	db $f6
diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm
index 792dafa2..96df9290 100755
--- a/scripts/fuchsiamart.asm
+++ b/scripts/fuchsiamart.asm
@@ -1,15 +1,15 @@
-FuchsiaMartScript: ; 1dd88 (7:5d88)
+FuchsiaMartScript:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaMartTextPointers: ; 1dd8b (7:5d8b)
-	dw FuchsiaMartText1
+FuchsiaMartTextPointers:
+	dw FuchsiaCashierText
 	dw FuchsiaMartText2
 	dw FuchsiaMartText3
 
-FuchsiaMartText2: ; 1dd91 (7:5d91)
+FuchsiaMartText2:
 	TX_FAR _FuchsiaMartText2
 	db "@"
 
-FuchsiaMartText3: ; 1dd96 (7:5d96)
+FuchsiaMartText3:
 	TX_FAR _FuchsiaMartText3
 	db "@"
diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm
index 26f88844..d17e5810 100755
--- a/scripts/fuchsiapokecenter.asm
+++ b/scripts/fuchsiapokecenter.asm
@@ -1,23 +1,23 @@
-FuchsiaPokecenterScript: ; 75063 (1d:5063)
+FuchsiaPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaPokecenterTextPointers: ; 75069 (1d:5069)
-	dw FuchsiaPokecenterText1
+FuchsiaPokecenterTextPointers:
+	dw FuchsiaHealNurseText
 	dw FuchsiaPokecenterText2
 	dw FuchsiaPokecenterText3
-	dw FuchsiaPokecenterText4
+	dw FuchsiaTradeNurseText
 
-FuchsiaPokecenterText1: ; 75071 (1d:5071)
+FuchsiaHealNurseText:
 	db $ff
 
-FuchsiaPokecenterText2: ; 75072 (1d:5072)
+FuchsiaPokecenterText2:
 	TX_FAR _FuchsiaPokecenterText1
 	db "@"
 
-FuchsiaPokecenterText3: ; 75077 (1d:5077)
+FuchsiaPokecenterText3:
 	TX_FAR _FuchsiaPokecenterText3
 	db "@"
 
-FuchsiaPokecenterText4: ; 7507c (1d:507c)
+FuchsiaTradeNurseText:
 	db $f6
diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm
index e524ed62..35570f48 100755
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
+IndigoPlateauLobbyScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
@@ -14,23 +14,23 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
 	ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
 	ret
 
-IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f)
-	dw IndigoPlateauLobbyText1
+IndigoPlateauLobbyTextPointers:
+	dw IndigoHealNurseText
 	dw IndigoPlateauLobbyText2
 	dw IndigoPlateauLobbyText3
-	dw IndigoPlateauLobbyText4
-	dw IndigoPlateauLobbyText5
+	dw IndigoCashierText
+	dw IndigoTradeNurseText
 
-IndigoPlateauLobbyText1: ; 19c89 (6:5c89)
+IndigoHealNurseText:
 	db $ff
 
-IndigoPlateauLobbyText2: ; 19c8a (6:5c8a)
-	TX_FAR _IndigoPlateauLobbyText1
+IndigoPlateauLobbyText2:
+	TX_FAR _IndigoPlateauLobbyText2
 	db "@"
 
-IndigoPlateauLobbyText3: ; 19c8f (6:5c8f)
+IndigoPlateauLobbyText3:
 	TX_FAR _IndigoPlateauLobbyText3
 	db "@"
 
-IndigoPlateauLobbyText5: ; 19c94 (6:5c94)
+IndigoTradeNurseText:
 	db $f6
diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm
index 85518fd2..51b64992 100755
--- a/scripts/lavendermart.asm
+++ b/scripts/lavendermart.asm
@@ -1,32 +1,32 @@
-LavenderMartScript: ; 5c92c (17:492c)
+LavenderMartScript:
 	jp EnableAutoTextBoxDrawing
 
-LavenderMartTextPointers: ; 5c92f (17:492f)
-	dw LavenderMartText1
+LavenderMartTextPointers:
+	dw LavenderCashierText
 	dw LavenderMartText2
 	dw LavenderMartText3
 
-LavenderMartText2: ; 5c935 (17:4935)
+LavenderMartText2:
 	TX_FAR _LavenderMartText2
 	db "@"
 
-LavenderMartText3: ; 5c93a (17:493a)
+LavenderMartText3:
 	TX_ASM
 	CheckEvent EVENT_RESCUED_MR_FUJI
-	jr nz, .asm_c88d4
-	ld hl, LavenderMart_5c953
+	jr nz, .Nugget
+	ld hl, .ReviveText
 	call PrintText
-	jr .asm_6d225
-.asm_c88d4
-	ld hl, LavenderMart_5c958
+	jr .done
+.Nugget
+	ld hl, .NuggetText
 	call PrintText
-.asm_6d225
+.done
 	jp TextScriptEnd
 
-LavenderMart_5c953: ; 5c953 (17:4953)
-	TX_FAR _LavenderMart_5c953
+.ReviveText
+	TX_FAR _LavenderMartReviveText
 	db "@"
 
-LavenderMart_5c958: ; 5c958 (17:4958)
-	TX_FAR _LavenderMart_5c958
+.NuggetText
+	TX_FAR _LavenderMartNuggetText
 	db "@"
diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm
index 452cc8a4..27a95b43 100755
--- a/scripts/lavenderpokecenter.asm
+++ b/scripts/lavenderpokecenter.asm
@@ -1,23 +1,23 @@
-LavenderPokecenterScript: ; 5c8da (17:48da)
+LavenderPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0)
-	dw LavenderPokecenterText1
+LavenderPokecenterTextPointers:
+	dw LavenderHealNurseText
 	dw LavenderPokecenterText2
 	dw LavenderPokecenterText3
-	dw LavenderPokecenterText4
+	dw LavenderTradeNurseText
 
-LavenderPokecenterText4: ; 5c8e8 (17:48e8)
+LavenderTradeNurseText:
 	db $f6
 
-LavenderPokecenterText1: ; 5c8e9 (17:48e9)
+LavenderHealNurseText:
 	db $ff
 
-LavenderPokecenterText2: ; 5c8ea (17:48ea)
-	TX_FAR _LavenderPokecenterText1
+LavenderPokecenterText2:
+	TX_FAR _LavenderPokecenterText2
 	db "@"
 
-LavenderPokecenterText3: ; 5c8ef (17:48ef)
+LavenderPokecenterText3:
 	TX_FAR _LavenderPokecenterText3
 	db "@"
diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm
index fd3e4e53..b5edee8d 100755
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -1,31 +1,31 @@
-MtMoonPokecenterScript: ; 492cf (12:52cf)
+MtMoonPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-MtMoonPokecenterTextPointers: ; 492d5 (12:52d5)
-	dw MtMoonPokecenterText1
+MtMoonPokecenterTextPointers:
+	dw MtMoonHealNurseText
 	dw MtMoonPokecenterText2
 	dw MtMoonPokecenterText3
-	dw MtMoonPokecenterText4
+	dw MagikarpSalesmanText
 	dw MtMoonPokecenterText5
-	dw MtMoonPokecenterText6
+	dw MtMoonTradeNurseText
 
-MtMoonPokecenterText1: ; 492e1 (12:52e1)
+MtMoonHealNurseText:
 	db $ff
 
-MtMoonPokecenterText2: ; 492e2 (12:52e2)
+MtMoonPokecenterText2:
 	TX_FAR _MtMoonPokecenterText1
 	db "@"
 
-MtMoonPokecenterText3: ; 492e7 (12:52e7)
+MtMoonPokecenterText3:
 	TX_FAR _MtMoonPokecenterText3
 	db "@"
 
-MtMoonPokecenterText4: ; 492ec (12:52ec)
+MagikarpSalesmanText:
 	TX_ASM
 	CheckEvent EVENT_BOUGHT_MAGIKARP, 1
 	jp c, .alreadyBoughtMagikarp
-	ld hl, MtMoonPokecenterText_4935c
+	ld hl, .Text1
 	call PrintText
 	ld a, MONEY_BOX
 	ld [wTextBoxID], a
@@ -40,7 +40,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
 	ld [hMoney + 1], a
 	call HasEnoughMoney
 	jr nc, .enoughMoney
-	ld hl, MtMoonPokecenterText_49366
+	ld hl, .NoMoneyText
 	jr .printText
 .enoughMoney
 	lb bc, MAGIKARP, 5
@@ -61,34 +61,34 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
 	SetEvent EVENT_BOUGHT_MAGIKARP
 	jr .done
 .choseNo
-	ld hl, MtMoonPokecenterText_49361
+	ld hl, .RefuseText
 	jr .printText
 .alreadyBoughtMagikarp
-	ld hl, MtMoonPokecenterText_4936b
+	ld hl, .Text2
 .printText
 	call PrintText
 .done
 	jp TextScriptEnd
 
-MtMoonPokecenterText_4935c: ; 4935c (12:535c)
-	TX_FAR _MtMoonPokecenterText_4935c
+.Text1
+	TX_FAR _MagikarpSalesmanText1
 	db "@"
 
-MtMoonPokecenterText_49361: ; 49361 (12:5361)
-	TX_FAR _MtMoonPokecenterText_49361
+.RefuseText
+	TX_FAR _MagikarpSalesmanNoText
 	db "@"
 
-MtMoonPokecenterText_49366: ; 49366 (12:5366)
-	TX_FAR _MtMoonPokecenterText_49366
+.NoMoneyText
+	TX_FAR _MagikarpSalesmanNoMoneyText
 	db "@"
 
-MtMoonPokecenterText_4936b: ; 4936b (12:536b)
-	TX_FAR _MtMoonPokecenterText_4936b
+.Text2
+	TX_FAR _MagikarpSalesmanText2
 	db "@"
 
-MtMoonPokecenterText5: ; 49370 (12:5370)
+MtMoonPokecenterText5:
 	TX_FAR _MtMoonPokecenterText5
 	db "@"
 
-MtMoonPokecenterText6: ; 49375 (12:5375)
+MtMoonTradeNurseText:
 	db $f6
diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm
index 62831d1b..d5281704 100755
--- a/scripts/pewtermart.asm
+++ b/scripts/pewtermart.asm
@@ -1,30 +1,28 @@
-PewterMartScript: ; 74cad (1d:4cad)
+PewterMartScript:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	ret
 
-PewterMartTextPointers: ; 74cb6 (1d:4cb6)
-	dw PewterMartText1
+PewterMartTextPointers:
+	dw PewterCashierText
 	dw PewterMartText2
 	dw PewterMartText3
 
-PewterMartText2: ; 74cbc (1d:4cbc)
+PewterMartText2:
 	TX_ASM
-	ld hl, PewterMartText_74cc6
+	ld hl, .Text
 	call PrintText
 	jp TextScriptEnd
-
-PewterMartText_74cc6: ; 74cc6 (1d:4cc6)
-	TX_FAR _PewterMartText_74cc6
+.Text
+	TX_FAR _PewterMartText2
 	db "@"
 
-PewterMartText3: ; 74ccb (1d:4ccb)
+PewterMartText3:
 	TX_ASM
-	ld hl, PewterMartText_74cd5
+	ld hl, .Text
 	call PrintText
 	jp TextScriptEnd
-
-PewterMartText_74cd5: ; 74cd5 (1d:4cd5)
-	TX_FAR _PewterMartText_74cd5
+.Text
+	TX_FAR _PewterMartText3
 	db "@"
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm
index 46d4d509..9398d027 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -1,25 +1,25 @@
-PewterPokecenterScript: ; 5c587 (17:4587)
+PewterPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-PewterPokecenterTextPointers: ; 5c58d (17:458d)
-	dw PewterPokecenterText1
+PewterPokecenterTextPointers:
+	dw PewterHealNurseText
 	dw PewterPokecenterText2
-	dw PewterPokecenterText3
-	dw PewterPokecenterText4
+	dw PewterJigglypuffText
+	dw PewterTradeNurseText
 
-PewterPokecenterText1: ; 5c595 (17:4595)
+PewterHealNurseText:
 	db $ff
 
-PewterPokecenterText2: ; 5c596 (17:4596)
-	TX_FAR _PewterPokecenterText1
+PewterPokecenterText2:
+	TX_FAR _PewterPokecenterText2
 	db "@"
 
-PewterPokecenterText3: ; 5c59b (17:459b)
+PewterJigglypuffText:
 	TX_ASM
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, PewterPokecenterText5
+	ld hl, .Text
 	call PrintText
 	ld a, $ff
 	call PlaySound
@@ -70,16 +70,16 @@ PewterPokecenterText3: ; 5c59b (17:459b)
 	call PlayDefaultMusic
 	jp TextScriptEnd
 
-PewterPokecenterText5: ; 5c603 (17:4603)
-	TX_FAR _PewterPokecenterText5
+.Text
+	TX_FAR _PewterJigglypuffText
 	db "@"
 
-JigglypuffFacingDirections: ; 5c608 (17:4608)
+JigglypuffFacingDirections:
 	db $30 | SPRITE_FACING_DOWN
 	db $30 | SPRITE_FACING_LEFT
 	db $30 | SPRITE_FACING_UP
 	db $30 | SPRITE_FACING_RIGHT
 JigglypuffFacingDirectionsEnd:
 
-PewterPokecenterText4: ; 5c60c (17:460c)
+PewterTradeNurseText:
 	db $f6
diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm
index 5e822bca..7bcdc1ae 100755
--- a/scripts/rocktunnelpokecenter.asm
+++ b/scripts/rocktunnelpokecenter.asm
@@ -1,23 +1,23 @@
-RockTunnelPokecenterScript: ; 493ba (12:53ba)
+RockTunnelPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0)
-	dw RockTunnelPokecenterText1
+RockTunnelPokecenterTextPointers:
+	dw RockTunnelHealNurseText
 	dw RockTunnelPokecenterText2
 	dw RockTunnelPokecenterText3
-	dw RockTunnelPokecenterText4
+	dw RockTunnelTradeNurseText
 
-RockTunnelPokecenterText1: ; 493c8 (12:53c8)
+RockTunnelHealNurseText:
 	db $ff
 
-RockTunnelPokecenterText2: ; 493c9 (12:53c9)
-	TX_FAR _RockTunnelPokecenterText1
+RockTunnelPokecenterText2:
+	TX_FAR _RockTunnelPokecenterText2
 	db "@"
 
-RockTunnelPokecenterText3: ; 493ce (12:53ce)
+RockTunnelPokecenterText3:
 	TX_FAR _RockTunnelPokecenterText3
 	db "@"
 
-RockTunnelPokecenterText4: ; 493d3 (12:53d3)
+RockTunnelTradeNurseText:
 	db $f6
diff --git a/scripts/saffronmart.asm b/scripts/saffronmart.asm
index 9ee1db0e..8b140610 100755
--- a/scripts/saffronmart.asm
+++ b/scripts/saffronmart.asm
@@ -1,15 +1,15 @@
-SaffronMartScript: ; 5d409 (17:5409)
+SaffronMartScript:
 	jp EnableAutoTextBoxDrawing
 
-SaffronMartTextPointers: ; 5d40c (17:540c)
-	dw SaffronMartText1
+SaffronMartTextPointers:
+	dw SaffronCashierText
 	dw SaffronMartText2
 	dw SaffronMartText3
 
-SaffronMartText2: ; 5d412 (17:5412)
+SaffronMartText2:
 	TX_FAR _SaffronMartText2
 	db "@"
 
-SaffronMartText3: ; 5d417 (17:5417)
+SaffronMartText3:
 	TX_FAR _SaffronMartText3
 	db "@"
diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm
index 8f569a8e..b99ef629 100755
--- a/scripts/saffronpokecenter.asm
+++ b/scripts/saffronpokecenter.asm
@@ -1,23 +1,23 @@
-SaffronPokecenterScript: ; 5d535 (17:5535)
+SaffronPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-SaffronPokecenterTextPointers: ; 5d53b (17:553b)
-	dw SaffronPokecenterText1
+SaffronPokecenterTextPointers:
+	dw SaffronHealNurseText
 	dw SaffronPokecenterText2
 	dw SaffronPokecenterText3
-	dw SaffronPokecenterText4
+	dw SaffronTradeNurseText
 
-SaffronPokecenterText1: ; 5d543 (17:5543)
+SaffronHealNurseText:
 	db $ff
 
-SaffronPokecenterText2: ; 5d544 (17:5544)
-	TX_FAR _SaffronPokecenterText1
+SaffronPokecenterText2:
+	TX_FAR _SaffronPokecenterText2
 	db "@"
 
-SaffronPokecenterText3: ; 5d549 (17:5549)
+SaffronPokecenterText3:
 	TX_FAR _SaffronPokecenterText3
 	db "@"
 
-SaffronPokecenterText4: ; 5d54e (17:554e)
+SaffronTradeNurseText:
 	db $f6
diff --git a/scripts/vermilionmart.asm b/scripts/vermilionmart.asm
index 921e7852..2d4df78d 100755
--- a/scripts/vermilionmart.asm
+++ b/scripts/vermilionmart.asm
@@ -1,15 +1,15 @@
-VermilionMartScript: ; 5c9e1 (17:49e1)
+VermilionMartScript:
 	jp EnableAutoTextBoxDrawing
 
-VermilionMartTextPointers: ; 5c9e4 (17:49e4)
-	dw VermilionMartText1
+VermilionMartTextPointers:
+	dw VermilionCashierText
 	dw VermilionMartText2
 	dw VermilionMartText3
 
-VermilionMartText2: ; 5c9ea (17:49ea)
+VermilionMartText2:
 	TX_FAR _VermilionMartText2
 	db "@"
 
-VermilionMartText3: ; 5c9ef (17:49ef)
+VermilionMartText3:
 	TX_FAR _VermilionMartText3
 	db "@"
diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm
index 6e85b3e3..09c8a937 100755
--- a/scripts/vermilionpokecenter.asm
+++ b/scripts/vermilionpokecenter.asm
@@ -1,23 +1,23 @@
-VermilionPokecenterScript: ; 5c98f (17:498f)
+VermilionPokecenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-VermilionPokecenterTextPointers: ; 5c995 (17:4995)
-	dw VermilionPokecenterText1
+VermilionPokecenterTextPointers:
+	dw VermilionHealNurseText
 	dw VermilionPokecenterText2
 	dw VermilionPokecenterText3
-	dw VermilionPokecenterText4
+	dw VermilionTradeNurseText
 
-VermilionPokecenterText1: ; 5c99d (17:499d)
+VermilionHealNurseText:
 	db $ff
 
-VermilionPokecenterText2: ; 5c99e (17:499e)
-	TX_FAR _VermilionPokecenterText1
+VermilionPokecenterText2:
+	TX_FAR _VermilionPokecenterText2
 	db "@"
 
-VermilionPokecenterText3: ; 5c9a3 (17:49a3)
+VermilionPokecenterText3:
 	TX_FAR _VermilionPokecenterText3
 	db "@"
 
-VermilionPokecenterText4: ; 5c9a8 (17:49a8)
+VermilionTradeNurseText:
 	db $f6
diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm
index 65d97519..542040a6 100755
--- a/scripts/viridianmart.asm
+++ b/scripts/viridianmart.asm
@@ -1,11 +1,11 @@
-ViridianMartScript: ; 1d46e (7:546e)
+ViridianMartScript:
 	call ViridianMartScript_1d47d
 	call EnableAutoTextBoxDrawing
 	ld hl, ViridianMartScriptPointers
 	ld a, [wViridianMarketCurScript]
 	jp CallFunctionInTable
 
-ViridianMartScript_1d47d: ; 1d47d (7:547d)
+ViridianMartScript_1d47d:
 	CheckEvent EVENT_OAK_GOT_PARCEL
 	jr nz, .asm_1d489
 	ld hl, ViridianMartTextPointers
@@ -19,12 +19,12 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d)
 	ld [wMapTextPtr+1], a
 	ret
 
-ViridianMartScriptPointers: ; 1d495 (7:5495)
+ViridianMartScriptPointers:
 	dw ViridianMartScript0
 	dw ViridianMartScript1
 	dw ViridianMartScript2
 
-ViridianMartScript0: ; 1d49b (7:549b)
+ViridianMartScript0:
 	call UpdateSprites
 	ld a, $4
 	ld [hSpriteIndexOrTextID], a
@@ -39,12 +39,12 @@ ViridianMartScript0: ; 1d49b (7:549b)
 	ld [wViridianMarketCurScript], a
 	ret
 
-RLEMovement1d4bb: ; 1d4bb (7:54bb)
+RLEMovement1d4bb:
 	db D_LEFT, $01
 	db D_UP, $02
 	db $ff
 
-ViridianMartScript1: ; 1d4c0 (7:54c0)
+ViridianMartScript1:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -58,36 +58,36 @@ ViridianMartScript1: ; 1d4c0 (7:54c0)
 	ld a, $2
 	ld [wViridianMarketCurScript], a
 	; fallthrough
-ViridianMartScript2: ; 1d4df (7:54df)
+ViridianMartScript2:
 	ret
 
-ViridianMartTextPointers: ; 1d4e0 (7:54e0)
+ViridianMartTextPointers:
 	dw ViridianMartText1
 	dw ViridianMartText2
 	dw ViridianMartText3
 	dw ViridianMartText4
 	dw ViridianMartText5
-	dw ViridianMartText6
+	dw ViridianCashierText
 	dw ViridianMartText2
 	dw ViridianMartText3
 
-ViridianMartText1: ; 1d4f0 (7:54f0)
+ViridianMartText1:
 	TX_FAR _ViridianMartText1
 	db "@"
 
-ViridianMartText4: ; 1d4f5 (7:54f5)
+ViridianMartText4:
 	TX_FAR _ViridianMartText4
 	db "@"
 
-ViridianMartText5: ; 1d4fa (7:54fa)
+ViridianMartText5:
 	TX_FAR ViridianMartParcelQuestText
 	db $11
 	db "@"
 
-ViridianMartText2: ; 1d500 (7:5500)
+ViridianMartText2:
 	TX_FAR _ViridianMartText2
 	db "@"
 
-ViridianMartText3: ; 1d505 (7:5505)
+ViridianMartText3:
 	TX_FAR _ViridianMartText3
 	db "@"
diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm
index ae5e32c8..d178446a 100755
--- a/scripts/viridianpokecenter.asm
+++ b/scripts/viridianpokecenter.asm
@@ -1,23 +1,23 @@
-ViridianPokeCenterScript: ; 4425d (11:425d)
+ViridianPokeCenterScript:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-ViridianPokecenterTextPointers: ; 44263 (11:4263)
-	dw ViridianPokeCenterText1
+ViridianPokecenterTextPointers:
+	dw ViridianHealNurseText
 	dw ViridianPokeCenterText2
 	dw ViridianPokeCenterText3
-	dw ViridianPokeCenterText4
+	dw ViridianTradeNurseText
 
-ViridianPokeCenterText1: ; 4426b (11:426b)
+ViridianHealNurseText:
 	db $ff
 
-ViridianPokeCenterText2: ; 4426c (11:426c)
-	TX_FAR _ViridianPokeCenterText1
+ViridianPokeCenterText2:
+	TX_FAR _ViridianPokeCenterText2
 	db "@"
 
-ViridianPokeCenterText3: ; 44271 (11:4271)
+ViridianPokeCenterText3:
 	TX_FAR _ViridianPokeCenterText3
 	db "@"
 
-ViridianPokeCenterText4: ; 44276 (11:4276)
+ViridianTradeNurseText:
 	db $f6