Improve some signpost labels.

maps/AzaleaTown.asm

@@ -194,41 +194,32 @@ KurtOutsideScript_0x19810c: ; 0x19810c
 	end
 ; 0x198117
 
-MapAzaleaTownSignpost0Script: ; 0x198117
-	jumptext UnknownText_0x19865a
-; 0x19811a
+AzaleaTownSign:
+	jumptext AzaleaTownSignText
 
-MapAzaleaTownSignpost1Script: ; 0x19811a
-	jumptext UnknownText_0x198693
-; 0x19811d
+KurtsHouseSign:
+	jumptext KurtsHouseSignText
 
-MapAzaleaTownSignpost2Script: ; 0x19811d
-	jumptext UnknownText_0x1986a1
-; 0x198120
+AzaleaGymSign:
+	jumptext AzaleaGymSignText
 
-MapAzaleaTownSignpost3Script: ; 0x198120
-	jumptext UnknownText_0x1986e7
-; 0x198123
+SlowpokeWellSign:
+	jumptext SlowpokeWellSignText
 
-MapAzaleaTownSignpost4Script: ; 0x198123
-	jumptext UnknownText_0x19878d
-; 0x198126
+CharcoalKilnSign:
+	jumptext CharcoalKilnSignText
 
-MapAzaleaTownSignpost7Script: ; 0x198126
-	jumptext UnknownText_0x19879c
-; 0x198129
+AzaleaTownIlextForestSign:
+	jumptext AzaleaTownIlexForestSignText
 
-MapAzaleaTownSignpost5Script: ; 0x198129
+AzaleaTownPokeCenterSign:
 	jumpstd pokecentersign
-; 0x19812c
 
-MapAzaleaTownSignpost6Script: ; 0x19812c
+AzaleaTownMartSign:
 	jumpstd martsign
-; 0x19812f
 
-FruitTreeScript_0x19812f: ; 0x19812f
+WhiteApricornTree:
 	fruittree $14
-; 0x198131
 
 MapAzaleaTownSignpostItem8: ; 0x198131
 	dw $00b1
@@ -448,21 +439,19 @@ UnknownText_0x198628: ; 0x198628
 	done
 ; 0x19865a
 
-UnknownText_0x19865a: ; 0x19865a
+AzaleaTownSignText:
 	text "AZALEA TOWN"
 	line "Where People and"
 
 	para "#MON Live in"
 	line "Happy Harmony"
 	done
-; 0x198693
 
-UnknownText_0x198693: ; 0x198693
+KurtsHouseSignText:
 	text "KURT'S HOUSE"
 	done
-; 0x1986a1
 
-UnknownText_0x1986a1: ; 0x1986a1
+AzaleaGymSignText:
 	text "AZALEA TOWN"
 	line "#MON GYM"
 	cont "LEADER: BUGSY"
@@ -471,9 +460,8 @@ UnknownText_0x1986a1: ; 0x1986a1
 	line "Bug #MON"
 	cont "Encyclopedia"
 	done
-; 0x1986e7
 
-UnknownText_0x1986e7: ; 0x1986e7
+SlowpokeWellSignText:
 	text "SLOWPOKE WELL"
 
 	para "Also known as the"
@@ -489,20 +477,17 @@ UnknownText_0x1986e7: ; 0x1986e7
 	para "ended a drought"
 	line "400 years ago."
 	done
-; 0x19878d
 
-UnknownText_0x19878d: ; 0x19878d
+CharcoalKilnSignText:
 	text "CHARCOAL KILN"
 	done
-; 0x19879c
 
-UnknownText_0x19879c: ; 0x19879c
+AzaleaTownIlexForestSignText:
 	text "ILEX FOREST"
 
 	para "Enter through the"
 	line "gate."
 	done
-; 0x1987c1
 
 AzaleaTown_MapEventHeader: ; 0x1987c1
 	; filler
@@ -527,14 +512,14 @@ AzaleaTown_MapEventHeader: ; 0x1987c1
 
 	; signposts
 	db 9
-	signpost 9, 19, $0, MapAzaleaTownSignpost0Script
-	signpost 9, 10, $0, MapAzaleaTownSignpost1Script
-	signpost 15, 14, $0, MapAzaleaTownSignpost2Script
-	signpost 7, 29, $0, MapAzaleaTownSignpost3Script
-	signpost 13, 19, $0, MapAzaleaTownSignpost4Script
-	signpost 9, 16, $0, MapAzaleaTownSignpost5Script
-	signpost 5, 22, $0, MapAzaleaTownSignpost6Script
-	signpost 9, 3, $0, MapAzaleaTownSignpost7Script
+	signpost 9, 19, $0, AzaleaTownSign
+	signpost 9, 10, $0, KurtsHouseSign
+	signpost 15, 14, $0, AzaleaGymSign
+	signpost 7, 29, $0, SlowpokeWellSign
+	signpost 13, 19, $0, CharcoalKilnSign
+	signpost 9, 16, $0, AzaleaTownPokeCenterSign
+	signpost 5, 22, $0, AzaleaTownMartSign
+	signpost 9, 3, $0, AzaleaTownIlextForestSign
 	signpost 6, 31, $7, MapAzaleaTownSignpostItem8
 
 	; people-events
@@ -547,7 +532,7 @@ AzaleaTown_MapEventHeader: ; 0x1987c1
 	person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
 	person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
 	person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9
-	person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19812f, $ffff
+	person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, $ffff
 	person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf
 	person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc
 	person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4

maps/BattleTower1F.asm

@@ -109,7 +109,7 @@ UnknownScript_0x9e44e: ; 0x9e44e
 	writebyte $8
 	special Function170687
 UnknownScript_0x9e454: ; 0x9e454
-	musicfadeout $0000, $8
+	musicfadeout MUSIC_NONE, $8
 	domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0
 	domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0
 	domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0

maps/BlackthornCity.asm

@@ -127,33 +127,26 @@ SantosNotSaturdayScript:
 	loadmovesprites
 	end
 
-MapBlackthornCitySignpost0Script: ; 0x1a4765
-	jumptext UnknownText_0x1a4b67
-; 0x1a4768
+BlackthornCitySign:
+	jumptext BlackthornCitySignText
 
-MapBlackthornCitySignpost1Script: ; 0x1a4768
-	jumptext UnknownText_0x1a4b91
-; 0x1a476b
+BlackthornGymSign:
+	jumptext BlackthornGymSignText
 
-MapBlackthornCitySignpost2Script: ; 0x1a476b
-	jumptext UnknownText_0x1a4bd9
-; 0x1a476e
+MoveDeletersHouseSign:
+	jumptext MoveDeletersHouseSignText
 
-MapBlackthornCitySignpost3Script: ; 0x1a476e
-	jumptext UnknownText_0x1a4bef
-; 0x1a4771
+DragonDensSign:
+	jumptext DragonDensSignText
 
-MapBlackthornCitySignpost4Script: ; 0x1a4771
-	jumptext UnknownText_0x1a4c03
-; 0x1a4774
+BlackthornCityTrainerTips:
+	jumptext BlackthornCityTrainerTipsText
 
-MapBlackthornCitySignpost6Script: ; 0x1a4774
+BlackthornCityPokeCenterSign:
 	jumpstd pokecentersign
-; 0x1a4777
 
-MapBlackthornCitySignpost5Script: ; 0x1a4777
+BlackthornCityMartSign:
 	jumpstd martsign
-; 0x1a477a
 
 UnknownText_0x1a477a: ; 0x1a477a
 	text "I am sorry."
@@ -296,15 +289,14 @@ UnknownText_0x1a4b1e: ; 0x1a4b1e
 	done
 ; 0x1a4b67
 
-UnknownText_0x1a4b67: ; 0x1a4b67
+BlackthornCitySignText:
 	text "BLACKTHORN CITY"
 
 	para "A Quiet Mountain"
 	line "Retreat"
 	done
-; 0x1a4b91
 
-UnknownText_0x1a4b91: ; 0x1a4b91
+BlackthornGymSignText: ; 0x1a4b91
 	text "BLACKTHORN CITY"
 	line "#MON GYM"
 	cont "LEADER: CLAIR"
@@ -314,19 +306,17 @@ UnknownText_0x1a4b91: ; 0x1a4b91
 	done
 ; 0x1a4bd9
 
-UnknownText_0x1a4bd9: ; 0x1a4bd9
+MoveDeletersHouseSignText:
 	text "MOVE DELETER'S"
 	line "HOUSE"
 	done
-; 0x1a4bef
 
-UnknownText_0x1a4bef: ; 0x1a4bef
+DragonDensSignText:
 	text "DRAGON'S DEN"
 	line "AHEAD"
 	done
-; 0x1a4c03
 
-UnknownText_0x1a4c03: ; 0x1a4c03
+BlackthornCityTrainerTipsText: ; 0x1a4c03
 	text "TRAINER TIPS"
 
 	para "A #MON holding"
@@ -358,13 +348,13 @@ BlackthornCity_MapEventHeader: ; 0x1a4c57
 
 	; signposts
 	db 7
-	signpost 24, 34, $0, MapBlackthornCitySignpost0Script
-	signpost 13, 17, $0, MapBlackthornCitySignpost1Script
-	signpost 31, 7, $0, MapBlackthornCitySignpost2Script
-	signpost 3, 21, $0, MapBlackthornCitySignpost3Script
-	signpost 25, 5, $0, MapBlackthornCitySignpost4Script
-	signpost 29, 16, $0, MapBlackthornCitySignpost5Script
-	signpost 29, 22, $0, MapBlackthornCitySignpost6Script
+	signpost 24, 34, $0, BlackthornCitySign
+	signpost 13, 17, $0, BlackthornGymSign
+	signpost 31, 7, $0, MoveDeletersHouseSign
+	signpost 3, 21, $0, DragonDensSign
+	signpost 25, 5, $0, BlackthornCityTrainerTips
+	signpost 29, 16, $0, BlackthornCityMartSign
+	signpost 29, 22, $0, BlackthornCityPokeCenterSign
 
 	; people-events
 	db 9

maps/BlackthornDodrioTradeHouse.asm

@@ -4,20 +4,17 @@ BlackthornDodrioTradeHouse_MapScriptHeader: ; 0x195a28
 
 	; callback count
 	db 0
-; 0x195a2a
 
-LassScript_0x195a2a: ; 0x195a2a
+Emy:
 	faceplayer
 	loadfont
 	trade $3
 	closetext
 	loadmovesprites
 	end
-; 0x195a31
 
-MapBlackthornDodrioTradeHouseSignpost1Script: ; 0x195a31
+EmysHouseBookshelf:
 	jumpstd magazinebookshelf
-; 0x195a34
 
 BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34
 	; filler
@@ -33,10 +30,10 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34
 
 	; signposts
 	db 2
-	signpost 1, 0, $0, MapBlackthornDodrioTradeHouseSignpost1Script
-	signpost 1, 1, $0, MapBlackthornDodrioTradeHouseSignpost1Script
+	signpost 1, 0, $0, EmysHouseBookshelf
+	signpost 1, 1, $0, EmysHouseBookshelf
 
 	; people-events
 	db 1
-	person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff
+	person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, $ffff
 ; 0x195a5b

maps/BlackthornGym2F.asm

@@ -65,9 +65,8 @@ UnknownScript_0x195758: ; 0x195758
 ; 0x19575e
 
 
-BoulderScript_0x19575e: ; 0x19575e
+BlackthornGymBoulder:
 	jumpstd strengthboulder
-; 0x195761
 
 TrainerCooltrainermCody: ; 0x195761
 	; bit/flag number
@@ -201,10 +200,9 @@ BlackthornGym2F_MapEventHeader: ; 0x1958c0
 	db 8
 	person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff
 	person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff
-	person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0706
-	person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0707
-	person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0708
-	person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
-	person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
-	person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff
-; 0x195947
+	person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0706
+	person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0707
+	person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0708
+	person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff
+	person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff
+	person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff

maps/BurnedTower1F.asm

@@ -137,9 +137,8 @@ MortyScript_0x185cbf: ; 0x185cbf
 	jumptextfaceplayer UnknownText_0x186002
 ; 0x185cc2
 
-RockScript_0x185cc2: ; 0x185cc2
+BurnedTower1FRock:
 	jumpstd smashrock
-; 0x185cc5
 
 MapBurnedTower1FSignpostItem0: ; 0x185cc5
 	dw $0080
@@ -339,7 +338,7 @@ BurnedTower1F_MapEventHeader: ; 0x1860b2
 
 	; people-events
 	db 5
-	person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, RockScript_0x185cc2, $ffff
+	person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, $ffff
 	person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765
 	person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5
 	person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764

maps/BurnedTowerB1F.asm

@@ -123,9 +123,8 @@ ItemFragment_0x186231: ; 0x186231
 	db TM_20, 1
 ; 0x186233
 
-BoulderScript_0x186233: ; 0x186233
+BurnedTowerB1FBoulder:
 	jumpstd strengthboulder
-; 0x186236
 
 MovementData_0x186236: ; 0x186236
 	db $39 ; movement
@@ -269,7 +268,7 @@ BurnedTowerB1F_MapEventHeader: ; 0x1863de
 
 	; people-events
 	db 9
-	person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x186233, $ffff
+	person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, $ffff
 	person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a
 	person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a
 	person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a

maps/CeladonCafe.asm

@@ -87,40 +87,36 @@ UnknownScript_0x7309a: ; 0x7309a
 	end
 ; 0x730ad
 
-MapCeladonCafeSignpost0Script: ; 0x730ad
-	jumptext UnknownText_0x73285
-; 0x730b0
+EatathonContestPoster:
+	jumptext EatathonContestPosterText
 
-MapCeladonCafeSignpost1Script: ; 0x730b0
+CeladonCafeTrashcan:
 	checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
-	iftrue UnknownScript_0x730db
+	iftrue .TrashEmpty
 	giveitem LEFTOVERS, $1
-	iffalse UnknownScript_0x730cd
+	iffalse .PackFull
 	loadfont
 	itemtotext LEFTOVERS, $0
-	writetext UnknownText_0x732e7
+	writetext FoundLeftoversText
 	playsound SFX_ITEM
 	waitbutton
 	itemnotify
 	loadmovesprites
 	setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
 	end
-; 0x730cd
 
-UnknownScript_0x730cd: ; 0x730cd
+.PackFull
 	loadfont
 	itemtotext LEFTOVERS, $0
-	writetext UnknownText_0x732e7
+	writetext FoundLeftoversText
 	keeptextopen
-	writetext UnknownText_0x732f7
+	writetext NoRoomForLeftoversText
 	closetext
 	loadmovesprites
 	end
-; 0x730db
 
-UnknownScript_0x730db: ; 0x730db
+.TrashEmpty
 	jumpstd trashcan
-; 0x730de
 
 UnknownText_0x730de: ; 0x730de
 	text "Hi!"
@@ -199,7 +195,7 @@ UnknownText_0x73278: ; 0x73278
 	done
 ; 0x73285
 
-UnknownText_0x73285: ; 0x73285
+EatathonContestPosterText:
 	text "Eatathon Contest!"
 	line "No time limit!"
 
@@ -209,21 +205,18 @@ UnknownText_0x73285: ; 0x73285
 	para "muncher gets it"
 	line "all for free!"
 	done
-; 0x732e7
 
-UnknownText_0x732e7: ; 0x732e7
+FoundLeftoversText:
 	text $52, " found"
 	line "@"
 	text_from_ram StringBuffer3
 	text "!"
 	done
-; 0x732f7
 
-UnknownText_0x732f7: ; 0x732f7
+NoRoomForLeftoversText:
 	text "But ", $52, " can't"
 	line "hold another item…"
 	done
-; 0x73316
 
 CeladonCafe_MapEventHeader: ; 0x73316
 	; filler
@@ -239,8 +232,8 @@ CeladonCafe_MapEventHeader: ; 0x73316
 
 	; signposts
 	db 2
-	signpost 0, 5, $0, MapCeladonCafeSignpost0Script
-	signpost 1, 7, $0, MapCeladonCafeSignpost1Script
+	signpost 0, 5, $0, EatathonContestPoster
+	signpost 1, 7, $0, CeladonCafeTrashcan
 
 	; people-events
 	db 5
@@ -249,4 +242,3 @@ CeladonCafe_MapEventHeader: ; 0x73316
 	person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff
 	person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff
 	person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff
-; 0x73371

maps/CeladonCity.asm

@@ -7,88 +7,68 @@ CeladonCity_MapScriptHeader: ; 0x1a9f3a
 
 	; callbacks
 
-	dbw 5, UnknownScript_0x1a9f3f
-; 0x1a9f3f
+	dbw 5, .Callback
 
-UnknownScript_0x1a9f3f: ; 0x1a9f3f
+.Callback
 	setflag $003d
 	return
-; 0x1a9f43
 
 FisherScript_0x1a9f43: ; 0x1a9f43
 	jumptextfaceplayer UnknownText_0x1a9f7d
-; 0x1a9f46
 
-PoliwagScript_0x1a9f46: ; 0x1a9f46
+CeladonCityPoliwrath:
 	loadfont
-	writetext UnknownText_0x1a9fcb
+	writetext CeladonCityPoliwrathText
 	cry POLIWRATH
 	closetext
 	loadmovesprites
 	end
-; 0x1a9f50
 
 TeacherScript_0x1a9f50: ; 0x1a9f50
 	jumptextfaceplayer UnknownText_0x1a9fde
-; 0x1a9f53
 
 GrampsScript_0x1a9f53: ; 0x1a9f53
 	jumptextfaceplayer UnknownText_0x1aa043
-; 0x1a9f56
 
 GrampsScript_0x1a9f56: ; 0x1a9f56
 	jumptextfaceplayer UnknownText_0x1aa0dc
-; 0x1a9f59
 
 YoungsterScript_0x1a9f59: ; 0x1a9f59
 	jumptextfaceplayer UnknownText_0x1aa115
-; 0x1a9f5c
 
 YoungsterScript_0x1a9f5c: ; 0x1a9f5c
 	jumptextfaceplayer UnknownText_0x1aa155
-; 0x1a9f5f
 
 TeacherScript_0x1a9f5f: ; 0x1a9f5f
 	jumptextfaceplayer UnknownText_0x1aa1bd
-; 0x1a9f62
 
 LassScript_0x1a9f62: ; 0x1a9f62
 	jumptextfaceplayer UnknownText_0x1aa306
-; 0x1a9f65
 
-MapCeladonCitySignpost0Script: ; 0x1a9f65
-	jumptext UnknownText_0x1aa340
-; 0x1a9f68
+CeladonCitySign: ; 0x1a9f65
+	jumptext CeladonCitySignText
 
-MapCeladonCitySignpost1Script: ; 0x1a9f68
-	jumptext UnknownText_0x1aa369
-; 0x1a9f6b
+CeladonGymSign: ; 0x1a9f68
+	jumptext CeladonGymSignText
 
-MapCeladonCitySignpost2Script: ; 0x1a9f6b
-	jumptext UnknownText_0x1aa3a9
-; 0x1a9f6e
+CeladonCityDeptStoreSign: ; 0x1a9f6b
+	jumptext CeladonCityDeptStoreSignText
 
-MapCeladonCitySignpost3Script: ; 0x1a9f6e
-	jumptext UnknownText_0x1aa3d4
-; 0x1a9f71
+CeladonCityMansionSign: ; 0x1a9f6e
+	jumptext CeladonCityMansionSignText
 
-MapCeladonCitySignpost4Script: ; 0x1a9f71
-	jumptext UnknownText_0x1aa3e5
-; 0x1a9f74
+CeladonCityGameCornerSign: ; 0x1a9f71
+	jumptext CeladonCityGameCornerSignText
 
-MapCeladonCitySignpost5Script: ; 0x1a9f74
-	jumptext UnknownText_0x1aa418
-; 0x1a9f77
+CeladonCityTrainerTips: ; 0x1a9f74
+	jumptext CeladonCityTrainerTipsText
 
-MapCeladonCitySignpost6Script: ; 0x1a9f77
+CeladonCityPokeCenterSign: ; 0x1a9f77
 	jumpstd pokecentersign
-; 0x1a9f7a
 
 MapCeladonCitySignpostItem7: ; 0x1a9f7a
 	dw $00fd
 	db PP_UP
-	
-; 0x1a9f7d
 
 UnknownText_0x1a9f7d: ; 0x1a9f7d
 	text "This POLIWRATH is"
@@ -100,10 +80,9 @@ UnknownText_0x1a9f7d: ; 0x1a9f7d
 	done
 ; 0x1a9fcb
 
-UnknownText_0x1a9fcb: ; 0x1a9fcb
+CeladonCityPoliwrathText:
 	text "POLIWRATH: Croak!"
 	done
-; 0x1a9fde
 
 UnknownText_0x1a9fde: ; 0x1a9fde
 	text "I lost at the slot"
@@ -210,7 +189,7 @@ UnknownText_0x1aa306: ; 0x1aa306
 	done
 ; 0x1aa340
 
-UnknownText_0x1aa340: ; 0x1aa340
+CeladonCitySignText: ; 0x1aa340
 	text "CELADON CITY"
 
 	para "The City of"
@@ -218,7 +197,7 @@ UnknownText_0x1aa340: ; 0x1aa340
 	done
 ; 0x1aa369
 
-UnknownText_0x1aa369: ; 0x1aa369
+CeladonGymSignText: ; 0x1aa369
 	text "CELADON CITY"
 	line "#MON GYM"
 	cont "LEADER: ERIKA"
@@ -228,26 +207,26 @@ UnknownText_0x1aa369: ; 0x1aa369
 	done
 ; 0x1aa3a9
 
-UnknownText_0x1aa3a9: ; 0x1aa3a9
+CeladonCityDeptStoreSignText: ; 0x1aa3a9
 	text "Find What You"
 	line "Need at CELADON"
 	cont "DEPT.STORE!"
 	done
 ; 0x1aa3d4
 
-UnknownText_0x1aa3d4: ; 0x1aa3d4
+CeladonCityMansionSignText: ; 0x1aa3d4
 	text "CELADON MANSION"
 	done
 ; 0x1aa3e5
 
-UnknownText_0x1aa3e5: ; 0x1aa3e5
+CeladonCityGameCornerSignText: ; 0x1aa3e5
 	text "The Playground for"
 	line "Everybody--CELADON"
 	cont "GAME CORNER"
 	done
 ; 0x1aa418
 
-UnknownText_0x1aa418: ; 0x1aa418
+CeladonCityTrainerTipsText: ; 0x1aa418
 	text "TRAINER TIPS"
 
 	para "GUARD SPEC."
@@ -284,19 +263,19 @@ CeladonCity_MapEventHeader: ; 0x1aa497
 
 	; signposts
 	db 8
-	signpost 21, 23, $0, MapCeladonCitySignpost0Script
-	signpost 31, 11, $0, MapCeladonCitySignpost1Script
-	signpost 9, 6, $0, MapCeladonCitySignpost2Script
-	signpost 9, 13, $0, MapCeladonCitySignpost3Script
-	signpost 21, 19, $0, MapCeladonCitySignpost4Script
-	signpost 21, 29, $0, MapCeladonCitySignpost5Script
-	signpost 9, 30, $0, MapCeladonCitySignpost6Script
+	signpost 21, 23, $0, CeladonCitySign
+	signpost 31, 11, $0, CeladonGymSign
+	signpost 9, 6, $0, CeladonCityDeptStoreSign
+	signpost 9, 13, $0, CeladonCityMansionSign
+	signpost 21, 19, $0, CeladonCityGameCornerSign
+	signpost 21, 29, $0, CeladonCityTrainerTips
+	signpost 9, 30, $0, CeladonCityPokeCenterSign
 	signpost 21, 37, $7, MapCeladonCitySignpostItem7
 
 	; people-events
 	db 9
 	person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff
-	person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, PoliwagScript_0x1a9f46, $ffff
+	person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, $ffff
 	person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff
 	person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff
 	person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff

maps/CeladonDeptStore1F.asm

@@ -1,32 +1,26 @@
-CeladonDeptStore1F_MapScriptHeader: ; 0x709de
+CeladonDeptStore1F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x709e0
 
-ReceptionistScript_0x709e0: ; 0x709e0
+ReceptionistScript_0x709e0:
 	jumptextfaceplayer UnknownText_0x709ef
-; 0x709e3
 
-GentlemanScript_0x709e3: ; 0x709e3
+GentlemanScript_0x709e3:
 	jumptextfaceplayer UnknownText_0x70a35
-; 0x709e6
 
-TeacherScript_0x709e6: ; 0x709e6
+TeacherScript_0x709e6:
 	jumptextfaceplayer UnknownText_0x70aa9
-; 0x709e9
 
-MapCeladonDeptStore1FSignpost0Script: ; 0x709e9
-	jumptext UnknownText_0x70aea
-; 0x709ec
+CeladonDeptStore1FDirectory:
+	jumptext CeladonDeptStore1FDirectoryText
 
-MapCeladonDeptStore6FSignpost1Script: ; 0x709ec
+CeladonDeptStore1FElevatorButton:
 	jumpstd elevatorbutton
-; 0x709ef
 
-UnknownText_0x709ef: ; 0x709ef
+UnknownText_0x709ef:
 	text "Hello! Welcome to"
 	line "CELADON DEPT."
 	cont "STORE!"
@@ -34,9 +28,8 @@ UnknownText_0x709ef: ; 0x709ef
 	para "The directory is"
 	line "on the wall."
 	done
-; 0x70a35
 
-UnknownText_0x70a35: ; 0x70a35
+UnknownText_0x70a35:
 	text "This DEPT.STORE is"
 	line "part of the same"
 
@@ -47,9 +40,8 @@ UnknownText_0x70a35: ; 0x70a35
 	line "renovated at the"
 	cont "same time."
 	done
-; 0x70aa9
 
-UnknownText_0x70aa9: ; 0x70aa9
+UnknownText_0x70aa9:
 	text "This is my first"
 	line "time here."
 
@@ -58,9 +50,8 @@ UnknownText_0x70aa9: ; 0x70aa9
 	para "I'm afraid I'll"
 	line "get lost."
 	done
-; 0x70aea
 
-UnknownText_0x70aea: ; 0x70aea
+CeladonDeptStore1FDirectoryText:
 	text "1F: SERVICE"
 	line "    COUNTER"
 
@@ -76,9 +67,8 @@ UnknownText_0x70aea: ; 0x70aea
 	para "6F: ROOFTOP"
 	line "    SQUARE"
 	done
-; 0x70b60
 
-CeladonDeptStore1F_MapEventHeader: ; 0x70b60
+CeladonDeptStore1F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -94,12 +84,11 @@ CeladonDeptStore1F_MapEventHeader: ; 0x70b60
 
 	; signposts
 	db 2
-	signpost 0, 14, $0, MapCeladonDeptStore1FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script
+	signpost 0, 14, $0, CeladonDeptStore1FDirectory
+	signpost 0, 3, $0, CeladonDeptStore1FElevatorButton
 
 	; people-events
 	db 3
 	person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff
 	person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff
 	person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff
-; 0x70bab

maps/CeladonDeptStore2F.asm

@@ -1,44 +1,37 @@
-CeladonDeptStore2F_MapScriptHeader: ; 0x70bab
+CeladonDeptStore2F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x70bad
 
-ClerkScript_0x70bad: ; 0x70bad
+ClerkScript_0x70bad:
 	faceplayer
 	loadfont
 	pokemart $0, $0017
 	loadmovesprites
 	end
-; 0x70bb5
 
-ClerkScript_0x70bb5: ; 0x70bb5
+ClerkScript_0x70bb5:
 	faceplayer
 	loadfont
 	pokemart $0, $0018
 	loadmovesprites
 	end
-; 0x70bbd
 
-PokefanMScript_0x70bbd: ; 0x70bbd
+PokefanMScript_0x70bbd:
 	jumptextfaceplayer UnknownText_0x70bc9
-; 0x70bc0
 
-YoungsterScript_0x70bc0: ; 0x70bc0
+YoungsterScript_0x70bc0:
 	jumptextfaceplayer UnknownText_0x70c3e
-; 0x70bc3
 
-MapCeladonDeptStore2FSignpost0Script: ; 0x70bc3
-	jumptext UnknownText_0x70c9c
-; 0x70bc6
+CeladonDeptStore2FDirectory:
+	jumptext CeladonDeptStore2FDirectoryText
 
-MapCeladonDeptStore2FSignpost1Script: ; 0x70bc6
+CeladonDeptStore2FElevatorButton:
 	jumpstd elevatorbutton
-; 0x70bc9
 
-UnknownText_0x70bc9: ; 0x70bc9
+UnknownText_0x70bc9:
 	text "I just recently"
 	line "became a trainer."
 
@@ -49,9 +42,8 @@ UnknownText_0x70bc9: ; 0x70bc9
 	line "the selection of"
 	cont "convenient items."
 	done
-; 0x70c3e
 
-UnknownText_0x70c3e: ; 0x70c3e
+UnknownText_0x70c3e:
 	text "My dad's having a"
 	line "hard time learning"
 
@@ -61,18 +53,16 @@ UnknownText_0x70c3e: ; 0x70c3e
 	para "supposed to be"
 	line "used…"
 	done
-; 0x70c9c
 
-UnknownText_0x70c9c: ; 0x70c9c
+CeladonDeptStore2FDirectoryText:
 	text "Top Grade Items"
 	line "for Trainers!"
 
 	para "2F: TRAINER'S"
 	line "    MARKET"
 	done
-; 0x70cd4
 
-CeladonDeptStore2F_MapEventHeader: ; 0x70cd4
+CeladonDeptStore2F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -87,8 +77,8 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4
 
 	; signposts
 	db 2
-	signpost 0, 14, $0, MapCeladonDeptStore2FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore2FSignpost1Script
+	signpost 0, 14, $0, CeladonDeptStore2FDirectory
+	signpost 0, 3, $0, CeladonDeptStore2FElevatorButton
 
 	; people-events
 	db 4
@@ -96,4 +86,3 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4
 	person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, $ffff
 	person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff
 	person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff
-; 0x70d27

maps/CeladonDeptStore3F.asm

@@ -1,24 +1,21 @@
-CeladonDeptStore3F_MapScriptHeader: ; 0x70d27
+CeladonDeptStore3F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x70d29
 
-ClerkScript_0x70d29: ; 0x70d29
+ClerkScript_0x70d29:
 	faceplayer
 	loadfont
 	pokemart $0, $0019
 	loadmovesprites
 	end
-; 0x70d31
 
-YoungsterScript_0x70d31: ; 0x70d31
+YoungsterScript_0x70d31:
 	jumptextfaceplayer UnknownText_0x70d53
-; 0x70d34
 
-GameboyKidScript_0x70d34: ; 0x70d34
+GameboyKidScript_0x70d34:
 	faceplayer
 	loadfont
 	writetext UnknownText_0x70d86
@@ -26,9 +23,8 @@ GameboyKidScript_0x70d34: ; 0x70d34
 	loadmovesprites
 	spriteface $4, $0
 	end
-; 0x70d3f
 
-GameboyKidScript_0x70d3f: ; 0x70d3f
+GameboyKidScript_0x70d3f:
 	faceplayer
 	loadfont
 	writetext UnknownText_0x70dc7
@@ -36,39 +32,33 @@ GameboyKidScript_0x70d3f: ; 0x70d3f
 	loadmovesprites
 	spriteface $5, $0
 	end
-; 0x70d4a
 
-SuperNerdScript_0x70d4a: ; 0x70d4a
+SuperNerdScript_0x70d4a:
 	jumptextfaceplayer UnknownText_0x70e61
-; 0x70d4d
 
-MapCeladonDeptStore3FSignpost1Script: ; 0x70d4d
+CeladonDeptStore3FElevatorButton:
 	jumpstd elevatorbutton
-; 0x70d50
 
-MapCeladonDeptStore3FSignpost0Script: ; 0x70d50
-	jumptext UnknownText_0x70e85
-; 0x70d53
+CeladonDeptStore3FDirectory:
+	jumptext CeladonDeptStore3FDirectoryText
 
-UnknownText_0x70d53: ; 0x70d53
+UnknownText_0x70d53:
 	text "I can't decide"
 	line "which #MON I"
 
 	para "should use this TM"
 	line "on…"
 	done
-; 0x70d86
 
-UnknownText_0x70d86: ; 0x70d86
+UnknownText_0x70d86:
 	text "Uh-oh! I traded my"
 	line "#MON without"
 
 	para "removing the UP-"
 	line "GRADE from it."
 	done
-; 0x70dc7
 
-UnknownText_0x70dc7: ; 0x70dc7
+UnknownText_0x70dc7:
 	text "Yeah! I'm finally"
 	line "getting a PORYGON!"
 
@@ -84,23 +74,20 @@ UnknownText_0x70dc7: ; 0x70dc7
 	line "turned into a dif-"
 	cont "ferent #MON!"
 	done
-; 0x70e61
 
-UnknownText_0x70e61: ; 0x70e61
+UnknownText_0x70e61:
 	text "The TM SHOP sells"
 	line "some rare moves."
 	done
-; 0x70e85
 
-UnknownText_0x70e85: ; 0x70e85
+CeladonDeptStore3FDirectoryText:
 	text "3F: TM SHOP"
 
 	para "Make Your #MON"
 	line "Stronger!"
 	done
-; 0x70eab
 
-CeladonDeptStore3F_MapEventHeader: ; 0x70eab
+CeladonDeptStore3F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -115,8 +102,8 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab
 
 	; signposts
 	db 2
-	signpost 0, 14, $0, MapCeladonDeptStore3FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore3FSignpost1Script
+	signpost 0, 14, $0, CeladonDeptStore3FDirectory
+	signpost 0, 3, $0, CeladonDeptStore3FElevatorButton
 
 	; people-events
 	db 5
@@ -125,4 +112,3 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab
 	person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, $ffff
 	person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff
 	person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff
-; 0x70f0b

maps/CeladonDeptStore4F.asm

@@ -1,60 +1,51 @@
-CeladonDeptStore4F_MapScriptHeader: ; 0x70f0b
+CeladonDeptStore4F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x70f0d
 
-ClerkScript_0x70f0d: ; 0x70f0d
+ClerkScript_0x70f0d:
 	faceplayer
 	loadfont
 	pokemart $0, $001a
 	loadmovesprites
 	end
-; 0x70f15
 
-SuperNerdScript_0x70f15: ; 0x70f15
+SuperNerdScript_0x70f15:
 	jumptextfaceplayer UnknownText_0x70f21
-; 0x70f18
 
-YoungsterScript_0x70f18: ; 0x70f18
+YoungsterScript_0x70f18:
 	jumptextfaceplayer UnknownText_0x70f55
-; 0x70f1b
 
-MapCeladonDeptStore4FSignpost0Script: ; 0x70f1b
-	jumptext UnknownText_0x70f8c
-; 0x70f1e
+CeladonDeptStore4FDirectory:
+	jumptext CeladonDeptStore4FDirectoryText
 
-MapCeladonDeptStore4FSignpost1Script: ; 0x70f1e
+CeladonDeptStore4FElevatorButton:
 	jumpstd elevatorbutton
-; 0x70f21
 
-UnknownText_0x70f21: ; 0x70f21
+UnknownText_0x70f21:
 	text "I'm here to buy"
 	line "SURF MAIL to send"
 	cont "to my girlfriend."
 	done
-; 0x70f55
 
-UnknownText_0x70f55: ; 0x70f55
+UnknownText_0x70f55:
 	text "This is the only"
 	line "place where you"
 
 	para "can buy LOVELY"
 	line "MAIL."
 	done
-; 0x70f8c
 
-UnknownText_0x70f8c: ; 0x70f8c
+CeladonDeptStore4FDirectoryText:
 	text "Express Yourself"
 	line "With Gifts!"
 
 	para "4F: WISEMAN GIFTS"
 	done
-; 0x70fbc
 
-CeladonDeptStore4F_MapEventHeader: ; 0x70fbc
+CeladonDeptStore4F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -69,12 +60,11 @@ CeladonDeptStore4F_MapEventHeader: ; 0x70fbc
 
 	; signposts
 	db 2
-	signpost 0, 14, $0, MapCeladonDeptStore4FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore4FSignpost1Script
+	signpost 0, 14, $0, CeladonDeptStore4FDirectory
+	signpost 0, 3, $0, CeladonDeptStore4FElevatorButton
 
 	; people-events
 	db 3
 	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, $ffff
 	person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff
 	person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff
-; 0x71002

maps/CeladonDeptStore5F.asm

@@ -1,48 +1,40 @@
-CeladonDeptStore5F_MapScriptHeader: ; 0x71002
+CeladonDeptStore5F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x71004
 
-ClerkScript_0x71004: ; 0x71004
+ClerkScript_0x71004:
 	faceplayer
 	loadfont
 	pokemart $0, $001b
 	loadmovesprites
 	end
-; 0x7100c
 
-ClerkScript_0x7100c: ; 0x7100c
+ClerkScript_0x7100c:
 	faceplayer
 	loadfont
 	pokemart $0, $001c
 	loadmovesprites
 	end
-; 0x71014
 
-GentlemanScript_0x71014: ; 0x71014
+GentlemanScript_0x71014:
 	jumptextfaceplayer UnknownText_0x71023
-; 0x71017
 
-SailorScript_0x71017: ; 0x71017
+SailorScript_0x71017:
 	jumptextfaceplayer UnknownText_0x71072
-; 0x7101a
 
-TeacherScript_0x7101a: ; 0x7101a
+TeacherScript_0x7101a:
 	jumptextfaceplayer UnknownText_0x710b6
-; 0x7101d
 
-MapCeladonDeptStore5FSignpost0Script: ; 0x7101d
-	jumptext UnknownText_0x71100
-; 0x71020
+CeladonDeptStore5FDirectory:
+	jumptext CeladonDeptStore5FDirectoryText
 
-MapCeladonDeptStore5FSignpost1Script: ; 0x71020
+CeladonDeptStore5FElevatorButton:
 	jumpstd elevatorbutton
-; 0x71023
 
-UnknownText_0x71023: ; 0x71023
+UnknownText_0x71023:
 	text "I want to buy some"
 	line "items that raise"
 
@@ -50,18 +42,16 @@ UnknownText_0x71023: ; 0x71023
 	line "I don't have"
 	cont "enough money…"
 	done
-; 0x71072
 
-UnknownText_0x71072: ; 0x71072
+UnknownText_0x71072:
 	text "I want PP UP, so I"
 	line "can raise the PP"
 
 	para "of moves. But you"
 	line "can't buy it…"
 	done
-; 0x710b6
 
-UnknownText_0x710b6: ; 0x710b6
+UnknownText_0x710b6:
 	text "Using items on"
 	line "them makes #-"
 	cont "MON happy."
@@ -69,14 +59,12 @@ UnknownText_0x710b6: ; 0x710b6
 	para "They hate certain"
 	line "items, though…"
 	done
-; 0x71100
 
-UnknownText_0x71100: ; 0x71100
+CeladonDeptStore5FDirectoryText:
 	text "5F: DRUG STORE"
 	done
-; 0x71110
 
-CeladonDeptStore5F_MapEventHeader: ; 0x71110
+CeladonDeptStore5F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -91,8 +79,8 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110
 
 	; signposts
 	db 2
-	signpost 0, 14, $0, MapCeladonDeptStore5FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore5FSignpost1Script
+	signpost 0, 14, $0, CeladonDeptStore5FDirectory
+	signpost 0, 3, $0, CeladonDeptStore5FElevatorButton
 
 	; people-events
 	db 5
@@ -101,4 +89,3 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110
 	person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff
 	person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff
 	person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff
-; 0x71170

maps/CeladonDeptStore6F.asm

@@ -1,4 +1,4 @@
-CeladonDeptStore6F_MapScriptHeader: ; 0x71170
+CeladonDeptStore6F_MapScriptHeader:
 	; trigger count
 	db 0
 
@@ -8,121 +8,104 @@ CeladonDeptStore6F_MapScriptHeader: ; 0x71170
 	; callbacks
 
 	dbw 1, UnknownScript_0x71175
-; 0x71175
 
-UnknownScript_0x71175: ; 0x71175
+UnknownScript_0x71175:
 	changeblock $c, $0, $3
 	return
-; 0x7117a
 
-SuperNerdScript_0x7117a: ; 0x7117a
+SuperNerdScript_0x7117a:
 	jumptextfaceplayer UnknownText_0x712c7
-; 0x7117d
 
-YoungsterScript_0x7117d: ; 0x7117d
+YoungsterScript_0x7117d:
 	jumptextfaceplayer UnknownText_0x71310
-; 0x71180
 
-MapCeladonDeptStore6FSignpost5Script: ; 0x71180
+CeladonVendingMachine:
 	loadfont
-	writetext UnknownText_0x71250
-UnknownScript_0x71184: ; 0x71184
+	writetext CeladonVendingText
+.Start
 	special Function24ae8
-	loadmenudata MenuDataHeader_0x71203
+	loadmenudata .MenuData
 	interpretmenu2
 	writebackup
-	if_equal $1, UnknownScript_0x7119a
-	if_equal $2, UnknownScript_0x711b4
-	if_equal $3, UnknownScript_0x711ce
+	if_equal $1, .FreshWater
+	if_equal $2, .SodaPop
+	if_equal $3, .Lemonade
 	loadmovesprites
 	end
-; 0x7119a
 
-UnknownScript_0x7119a: ; 0x7119a
+.FreshWater
 	checkmoney $0, 200
-	if_equal $2, UnknownScript_0x711f5
+	if_equal $2, .NotEnoughMoney
 	giveitem FRESH_WATER, $1
-	iffalse UnknownScript_0x711fc
+	iffalse .NotEnoughSpace
 	takemoney $0, 200
 	itemtotext FRESH_WATER, $0
-	jump UnknownScript_0x711e8
-; 0x711b4
+	jump .VendItem
 
-UnknownScript_0x711b4: ; 0x711b4
+.SodaPop
 	checkmoney $0, 300
-	if_equal $2, UnknownScript_0x711f5
+	if_equal $2, .NotEnoughMoney
 	giveitem SODA_POP, $1
-	iffalse UnknownScript_0x711fc
+	iffalse .NotEnoughSpace
 	takemoney $0, 300
 	itemtotext SODA_POP, $0
-	jump UnknownScript_0x711e8
-; 0x711ce
+	jump .VendItem
 
-UnknownScript_0x711ce: ; 0x711ce
+.Lemonade
 	checkmoney $0, 350
-	if_equal $2, UnknownScript_0x711f5
+	if_equal $2, .NotEnoughMoney
 	giveitem LEMONADE, $1
-	iffalse UnknownScript_0x711fc
+	iffalse .NotEnoughSpace
 	takemoney $0, 350
 	itemtotext LEMONADE, $0
-	jump UnknownScript_0x711e8
-; 0x711e8
+	jump .VendItem
 
-UnknownScript_0x711e8: ; 0x711e8
+.VendItem
 	pause 10
 	playsound SFX_ENTER_DOOR
-	writetext UnknownText_0x71274
+	writetext CeladonClangText
 	keeptextopen
 	itemnotify
-	jump UnknownScript_0x71184
-; 0x711f5
+	jump .Start
 
-UnknownScript_0x711f5: ; 0x711f5
-	writetext UnknownText_0x7128e
+.NotEnoughMoney
+	writetext CeladonVendingNoMoneyText
 	closetext
-	jump UnknownScript_0x71184
-; 0x711fc
+	jump .Start
 
-UnknownScript_0x711fc: ; 0x711fc
-	writetext UnknownText_0x712a7
+.NotEnoughSpace
+	writetext CeladonVendingNoSpaceText
 	closetext
-	jump UnknownScript_0x71184
-; 0x71203
+	jump .Start
 
-
-MenuDataHeader_0x71203: ; 0x71203
+.MenuData
 	db $40 ; flags
 	db 02, 00 ; start coords
 	db 11, 19 ; end coords
-	dw MenuData2_0x7120b
+	dw .MenuData2
 	db 1 ; default option
-; 0x7120b
 
-MenuData2_0x7120b: ; 0x7120b
+.MenuData2
 	db $80 ; flags
 	db 4 ; items
 	db "FRESH WATER  ¥200@"
 	db "SODA POP     ¥300@"
 	db "LEMONADE     ¥350@"
 	db "CANCEL@"
-; 0x71249
 
 
-MapCeladonDeptStore6FSignpost0Script: ; 0x7124a
-	jumptext UnknownText_0x7133e
-; 0x7124d
+CeladonDeptStore6FDirectory:
+	jumptext CeladonDeptStore6FDirectoryText
 
-UnknownScript_0x7124d: ; 0x7124d
+UnknownScript_0x7124d:
 	jumpstd elevatorbutton
-; 0x71250
 
-UnknownText_0x71250: ; 0x71250
+CeladonVendingText:
 	text "A vending machine!"
 	line "Here's the menu."
 	done
-; 0x71274
 
-UnknownText_0x71274: ; 0x71274
+CeladonClangText:
 	text "Clang!"
 
 	para "@"
@@ -130,21 +113,18 @@ UnknownText_0x71274: ; 0x71274
 	db $0
 	line "popped out."
 	done
-; 0x7128e
 
-UnknownText_0x7128e: ; 0x7128e
+CeladonVendingNoMoneyText:
 	text "Oops, not enough"
 	line "money…"
 	done
-; 0x712a7
 
-UnknownText_0x712a7: ; 0x712a7
+CeladonVendingNoSpaceText:
 	text "There's no more"
 	line "room for stuff…"
 	done
-; 0x712c7
 
-UnknownText_0x712c7: ; 0x712c7
+UnknownText_0x712c7:
 	text "A vending machine"
 	line "with a prize rou-"
 	cont "lette…"
@@ -152,23 +132,20 @@ UnknownText_0x712c7: ; 0x712c7
 	para "You never see"
 	line "those anymore."
 	done
-; 0x71310
 
-UnknownText_0x71310: ; 0x71310
+UnknownText_0x71310:
 	text "Aww! There's no"
 	line "games here!"
 
 	para "I wanted to play…"
 	done
-; 0x7133e
 
-UnknownText_0x7133e: ; 0x7133e
+CeladonDeptStore6FDirectoryText:
 	text "6F: ROOFTOP SQUARE"
 	line "VENDING MACHINES"
 	done
-; 0x71363
 
-CeladonDeptStore6F_MapEventHeader: ; 0x71363
+CeladonDeptStore6F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -182,15 +159,14 @@ CeladonDeptStore6F_MapEventHeader: ; 0x71363
 
 	; signposts
 	db 6
-	signpost 0, 14, $0, MapCeladonDeptStore6FSignpost0Script
-	signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script
-	signpost 1, 8, $1, MapCeladonDeptStore6FSignpost5Script
-	signpost 1, 9, $1, MapCeladonDeptStore6FSignpost5Script
-	signpost 1, 10, $1, MapCeladonDeptStore6FSignpost5Script
-	signpost 1, 11, $1, MapCeladonDeptStore6FSignpost5Script
+	signpost 0, 14, $0, CeladonDeptStore6FDirectory
+	signpost 0, 3, $0, CeladonDeptStore1FElevatorButton
+	signpost 1, 8, $1, CeladonVendingMachine
+	signpost 1, 9, $1, CeladonVendingMachine
+	signpost 1, 10, $1, CeladonVendingMachine
+	signpost 1, 11, $1, CeladonVendingMachine
 
 	; people-events
 	db 2
 	person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff
 	person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff
-; 0x713ab

maps/CeladonMansion1F.asm

@@ -6,46 +6,40 @@ CeladonMansion1F_MapScriptHeader: ; 0x713ed
 	db 0
 ; 0x713ef
 
-GrannyScript_0x713ef: ; 0x713ef
-	jumptextfaceplayer UnknownText_0x71416
-; 0x713f2
+CeladonMansionManager:
+	jumptextfaceplayer CeladonMansionManagerText
 
-GrowlitheScript_0x713f2: ; 0x713f2
+CeladonMansion1FMeowth:
 	loadfont
-	writetext UnknownText_0x71470
+	writetext CeladonMansion1FMeowthText
 	cry MEOWTH
 	closetext
 	loadmovesprites
 	end
-; 0x713fc
 
-ClefairyScript_0x713fc: ; 0x713fc
+CeladonMansion1FClefairy:
 	loadfont
-	writetext UnknownText_0x7147f
+	writetext CeladonMansion1FClefairyText
 	cry CLEFAIRY
 	closetext
 	loadmovesprites
 	end
-; 0x71406
 
-GrowlitheScript_0x71406: ; 0x71406
+CeladonMansion1FNidoranF:
 	loadfont
-	writetext UnknownText_0x71496
+	writetext CeladonMansion1FNidoranFText
 	cry NIDORAN_F
 	closetext
 	loadmovesprites
 	end
-; 0x71410
 
-MapCeladonMansion1FSignpost0Script: ; 0x71410
-	jumptext UnknownText_0x714ab
-; 0x71413
+CeladonMansionManagersSuiteSign:
+	jumptext CeladonMansionManagersSuiteSignText
 
-MapCeladonMansion1FSignpost2Script: ; 0x71413
+CeladonMansion1fBookshelf:
 	jumpstd picturebookshelf
-; 0x71416
 
-UnknownText_0x71416: ; 0x71416
+CeladonMansionManagerText:
 	text "My dear #MON"
 	line "keep me company,"
 
@@ -55,30 +49,25 @@ UnknownText_0x71416: ; 0x71416
 	para "MEOWTH even brings"
 	line "money home."
 	done
-; 0x71470
 
-UnknownText_0x71470: ; 0x71470
+CeladonMansion1FMeowthText:
 	text "MEOWTH: Meow!"
 	done
-; 0x7147f
 
-UnknownText_0x7147f: ; 0x7147f
+CeladonMansion1FClefairyText:
 	text "CLEFAIRY: Clef"
 	line "cleff!"
 	done
-; 0x71496
 
-UnknownText_0x71496: ; 0x71496
+CeladonMansion1FNidoranFText:
 	text "NIDORAN: Kya"
 	line "kyaoo!"
 	done
-; 0x714ab
 
-UnknownText_0x714ab: ; 0x714ab
+CeladonMansionManagersSuiteSignText:
 	text "CELADON MANSION"
 	line "MANAGER'S SUITE"
 	done
-; 0x714cc
 
 CeladonMansion1F_MapEventHeader: ; 0x714cc
 	; filler
@@ -97,14 +86,13 @@ CeladonMansion1F_MapEventHeader: ; 0x714cc
 
 	; signposts
 	db 3
-	signpost 8, 5, $1, MapCeladonMansion1FSignpost0Script
-	signpost 3, 0, $0, MapCeladonMansion1FSignpost2Script
-	signpost 3, 2, $0, MapCeladonMansion1FSignpost2Script
+	signpost 8, 5, $1, CeladonMansionManagersSuiteSign
+	signpost 3, 0, $0, CeladonMansion1fBookshelf
+	signpost 3, 2, $0, CeladonMansion1fBookshelf
 
 	; people-events
 	db 4
-	person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, GrannyScript_0x713ef, $ffff
-	person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x713f2, $ffff
-	person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, ClefairyScript_0x713fc, $ffff
-	person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x71406, $ffff
-; 0x7152e
+	person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, $ffff
+	person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, $ffff
+	person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, $ffff
+	person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, $ffff

maps/CeladonMansion2F.asm

@@ -1,24 +1,20 @@
-CeladonMansion2F_MapScriptHeader: ; 0x7152e
+CeladonMansion2F_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x71530
 
-MapCeladonMansion2FSignpost0Script: ; 0x71530
-	jumptext UnknownText_0x71539
-; 0x71533
+CeladonMansion2FComputer:
+	jumptext CeladonMansion2FComputerText
 
-MapCeladonMansion2FSignpost1Script: ; 0x71533
-	jumptext UnknownText_0x7162c
-; 0x71536
+CeladonMansion2FSign:
+	jumptext CeladonMansion2FSignText
 
-MapCeladonMansion2FSignpost2Script: ; 0x71536
+CeladonMansion2FBookshelf:
 	jumpstd difficultbookshelf
-; 0x71539
 
-UnknownText_0x71539: ; 0x71539
+CeladonMansion2FComputerText:
 	text $52, " turned on"
 	line "the PC."
 
@@ -47,15 +43,13 @@ UnknownText_0x71539: ; 0x71539
 
 	para "…"
 	done
-; 0x7162c
 
-UnknownText_0x7162c: ; 0x7162c
+CeladonMansion2FSignText:
 	text "GAME FREAK"
 	line "MEETING ROOM"
 	done
-; 0x71645
 
-CeladonMansion2F_MapEventHeader: ; 0x71645
+CeladonMansion2F_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -71,10 +65,9 @@ CeladonMansion2F_MapEventHeader: ; 0x71645
 
 	; signposts
 	db 3
-	signpost 3, 0, $0, MapCeladonMansion2FSignpost0Script
-	signpost 8, 5, $1, MapCeladonMansion2FSignpost1Script
-	signpost 3, 2, $0, MapCeladonMansion2FSignpost2Script
+	signpost 3, 0, $0, CeladonMansion2FComputer
+	signpost 8, 5, $1, CeladonMansion2FSign
+	signpost 3, 2, $0, CeladonMansion2FBookshelf
 
 	; people-events
 	db 0
-; 0x7166e

maps/CeruleanCity.asm

@@ -1,4 +1,4 @@
-CeruleanCity_MapScriptHeader: ; 0x184000
+CeruleanCity_MapScriptHeader:
 	; trigger count
 	db 0
 
@@ -7,15 +7,13 @@ CeruleanCity_MapScriptHeader: ; 0x184000
 
 	; callbacks
 
-	dbw 5, UnknownScript_0x184005
-; 0x184005
+	dbw 5, .Callback
 
-UnknownScript_0x184005: ; 0x184005
+.Callback
 	setflag $0038
 	return
-; 0x184009
 
-CooltrainerMScript_0x184009: ; 0x184009
+CooltrainerMScript_0x184009:
 	faceplayer
 	loadfont
 	checkevent EVENT_RETURNED_MACHINE_PART
@@ -24,29 +22,25 @@ CooltrainerMScript_0x184009: ; 0x184009
 	closetext
 	loadmovesprites
 	end
-; 0x184017
 
-UnknownScript_0x184017: ; 0x184017
+UnknownScript_0x184017:
 	writetext UnknownText_0x184144
 	closetext
 	loadmovesprites
 	end
-; 0x18401d
 
-SuperNerdScript_0x18401d: ; 0x18401d
+SuperNerdScript_0x18401d:
 	jumptextfaceplayer UnknownText_0x1841a8
-; 0x184020
 
-SlowpokeScript_0x184020: ; 0x184020
+CeruleanCitySlowbro:
 	loadfont
-	writetext UnknownText_0x1841e9
+	writetext CeruleanCitySlowbroText
 	cry SLOWBRO
 	closetext
 	loadmovesprites
 	end
-; 0x18402a
 
-CooltrainerFScript_0x18402a: ; 0x18402a
+CooltrainerFScript_0x18402a:
 	faceplayer
 	loadfont
 	writetext UnknownText_0x1841fa
@@ -58,7 +52,7 @@ CooltrainerFScript_0x18402a: ; 0x18402a
 	closetext
 	loadmovesprites
 	loadfont
-	writetext UnknownText_0x1841e9
+	writetext CeruleanCitySlowbroText
 	cry SLOWBRO
 	closetext
 	loadmovesprites
@@ -67,30 +61,27 @@ CooltrainerFScript_0x18402a: ; 0x18402a
 	closetext
 	loadmovesprites
 	end
-; 0x18404a
 
-FisherScript_0x18404a: ; 0x18404a
+FisherScript_0x18404a:
 	faceplayer
 	loadfont
 	checkevent EVENT_RETURNED_MACHINE_PART
 	iftrue UnknownScript_0x184058
 	checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	iftrue UnknownScript_0x18405e
-UnknownScript_0x184058: ; 0x184058
+UnknownScript_0x184058:
 	writetext UnknownText_0x18424e
 	closetext
 	loadmovesprites
 	end
-; 0x18405e
 
-UnknownScript_0x18405e: ; 0x18405e
+UnknownScript_0x18405e:
 	writetext UnknownText_0x184275
 	closetext
 	loadmovesprites
 	end
-; 0x184064
 
-YoungsterScript_0x184064: ; 0x184064
+YoungsterScript_0x184064:
 	faceplayer
 	loadfont
 	writetext UnknownText_0x1842a9
@@ -99,9 +90,8 @@ YoungsterScript_0x184064: ; 0x184064
 	checkevent $00fa
 	iffalse UnknownScript_0x184072
 	end
-; 0x184072
 
-UnknownScript_0x184072: ; 0x184072
+UnknownScript_0x184072:
 	waitbutton
 	playsound SFX_SECOND_PART_OF_ITEMFINDER
 	waitbutton
@@ -126,47 +116,36 @@ UnknownScript_0x184072: ; 0x184072
 	closetext
 	loadmovesprites
 	end
-; 0x1840a1
 
-MapCeruleanCitySignpost0Script: ; 0x1840a1
-	jumptext UnknownText_0x184312
-; 0x1840a4
+CeruleanCitySign:
+	jumptext CeruleanCitySignText
 
-MapCeruleanCitySignpost1Script: ; 0x1840a4
-	jumptext UnknownText_0x184345
-; 0x1840a7
+CeruleanGymSign:
+	jumptext CeruleanGymSignText
 
-MapCeruleanCitySignpost2Script: ; 0x1840a7
-	jumptext UnknownText_0x184381
-; 0x1840aa
+CeruleanBikeShopSign:
+	jumptext CeruleanBikeShopSignText
 
-MapCeruleanCitySignpost3Script: ; 0x1840aa
-	jumptext UnknownText_0x1843cc
-; 0x1840ad
+CeruleanPoliceSign:
+	jumptext CeruleanPoliceSignText
 
-MapCeruleanCitySignpost4Script: ; 0x1840ad
-	jumptext UnknownText_0x18443b
-; 0x1840b0
+CeruleanCapeSign:
+	jumptext CeruleanCapeSignText
 
-MapCeruleanCitySignpost5Script: ; 0x1840b0
-	jumptext UnknownText_0x184450
-; 0x1840b3
+CeruleanLockedDoor:
+	jumptext CeruleanLockedDoorText
 
-MapCeruleanCitySignpost6Script: ; 0x1840b3
+CeruleanCityPokeCenterSign:
 	jumpstd pokecentersign
-; 0x1840b6
 
-MapCeruleanCitySignpost7Script: ; 0x1840b6
+CeruleanCityMartSign:
 	jumpstd martsign
-; 0x1840b9
 
-MapCeruleanCitySignpostItem8: ; 0x1840b9
+MapCeruleanCitySignpostItem8:
 	dw $00fa
 	db BERSERK_GENE
-	
-; 0x1840bc
 
-UnknownText_0x1840bc: ; 0x1840bc
+UnknownText_0x1840bc:
 	text "KANTO's POWER"
 	line "PLANT?"
 
@@ -180,9 +159,8 @@ UnknownText_0x1840bc: ; 0x1840bc
 	line "an accident of"
 	cont "some sort there."
 	done
-; 0x184144
 
-UnknownText_0x184144: ; 0x184144
+UnknownText_0x184144:
 	text "You're collecting"
 	line "every single kind"
 	cont "of #MON?"
@@ -191,80 +169,69 @@ UnknownText_0x184144: ; 0x184144
 	line "a challenge, but"
 	cont "it sounds fun too."
 	done
-; 0x1841a8
 
-UnknownText_0x1841a8: ; 0x1841a8
+UnknownText_0x1841a8:
 	text "The CAPE in the"
 	line "north is a good"
 
 	para "place for dates."
 	line "Girls like it!"
 	done
-; 0x1841e9
 
-UnknownText_0x1841e9: ; 0x1841e9
+CeruleanCitySlowbroText:
 	text "SLOWBRO: Yarah?"
 	done
-; 0x1841fa
 
-UnknownText_0x1841fa: ; 0x1841fa
+UnknownText_0x1841fa:
 	text "My SLOWBRO and I"
 	line "make an awesome"
 	cont "combination!"
 	done
-; 0x184229
 
-UnknownText_0x184229: ; 0x184229
+UnknownText_0x184229:
 	text "SLOWBRO, show me"
 	line "your CONFUSION!"
 	done
-; 0x18424b
 
-UnknownText_0x18424b: ; 0x18424b
+UnknownText_0x18424b:
 	text "…"
 	done
-; 0x18424e
 
-UnknownText_0x18424e: ; 0x18424e
+UnknownText_0x18424e:
 	text "I'm a huge fan of"
 	line "CERULEAN GYM's"
 	cont "MISTY."
 	done
-; 0x184275
 
-UnknownText_0x184275: ; 0x184275
+UnknownText_0x184275:
 	text "I saw this shady"
 	line "guy go off toward"
 	cont "CERULEAN's CAPE."
 	done
-; 0x1842a9
 
-UnknownText_0x1842a9: ; 0x1842a9
+UnknownText_0x1842a9:
 	text "There used to be a"
 	line "cave here that had"
 
 	para "horribly powerful"
 	line "#MON in it."
 	done
-; 0x1842ee
 
-UnknownText_0x1842ee: ; 0x1842ee
+UnknownText_0x1842ee:
 	text "Ayuh?"
 
 	para "My ITEMFINDER is"
 	line "responding…"
 	done
-; 0x184312
 
-UnknownText_0x184312: ; 0x184312
+CeruleanCitySignText:
 	text "CERULEAN CITY"
 
 	para "A Mysterious Blue"
 	line "Aura Surrounds It"
 	done
-; 0x184345
 
-UnknownText_0x184345: ; 0x184345
+CeruleanGymSignText:
 	text "CERULEAN CITY"
 	line "#MON GYM"
 	cont "LEADER: MISTY"
@@ -272,9 +239,8 @@ UnknownText_0x184345: ; 0x184345
 	para "The Tomboyish"
 	line "Mermaid"
 	done
-; 0x184381
 
-UnknownText_0x184381: ; 0x184381
+CeruleanBikeShopSignText:
 	text "There's a notice"
 	line "here…"
 
@@ -282,9 +248,8 @@ UnknownText_0x184381: ; 0x184381
 	line "moved to GOLDENROD"
 	cont "CITY in JOHTO…"
 	done
-; 0x1843cc
 
-UnknownText_0x1843cc: ; 0x1843cc
+CeruleanPoliceSignText:
 	text "There's a notice"
 	line "here…"
 
@@ -296,20 +261,17 @@ UnknownText_0x1843cc: ; 0x1843cc
 
 	para "CERULEAN POLICE"
 	done
-; 0x18443b
 
-UnknownText_0x18443b: ; 0x18443b
+CeruleanCapeSignText:
 	text "CERULEAN CAPE"
 	line "AHEAD"
 	done
-; 0x184450
 
-UnknownText_0x184450: ; 0x184450
+CeruleanLockedDoorText:
 	text "It's locked…"
 	done
-; 0x18445d
 
-CeruleanCity_MapEventHeader: ; 0x18445d
+CeruleanCity_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -327,22 +289,21 @@ CeruleanCity_MapEventHeader: ; 0x18445d
 
 	; signposts
 	db 9
-	signpost 23, 23, $0, MapCeruleanCitySignpost0Script
-	signpost 25, 27, $0, MapCeruleanCitySignpost1Script
-	signpost 29, 11, $0, MapCeruleanCitySignpost2Script
-	signpost 17, 25, $0, MapCeruleanCitySignpost3Script
-	signpost 7, 23, $0, MapCeruleanCitySignpost4Script
-	signpost 29, 14, $0, MapCeruleanCitySignpost5Script
-	signpost 21, 20, $0, MapCeruleanCitySignpost6Script
-	signpost 29, 26, $0, MapCeruleanCitySignpost7Script
+	signpost 23, 23, $0, CeruleanCitySign
+	signpost 25, 27, $0, CeruleanGymSign
+	signpost 29, 11, $0, CeruleanBikeShopSign
+	signpost 17, 25, $0, CeruleanPoliceSign
+	signpost 7, 23, $0, CeruleanCapeSign
+	signpost 29, 14, $0, CeruleanLockedDoor
+	signpost 21, 20, $0, CeruleanCityPokeCenterSign
+	signpost 29, 26, $0, CeruleanCityMartSign
 	signpost 12, 2, $7, MapCeruleanCitySignpostItem8
 
 	; people-events
 	db 6
 	person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, $ffff
 	person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, $ffff
-	person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x184020, $ffff
+	person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, $ffff
 	person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, $ffff
 	person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff
 	person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff
-; 0x1844fc

maps/CharcoalKiln.asm

@@ -1,65 +1,63 @@
-CharcoalKiln_MapScriptHeader: ; 0x18dd18
+CharcoalKiln_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
 
-BossScript:
+CharcoalKilnBoss:
 	faceplayer
 	loadfont
 	checkevent EVENT_GOT_HM01_CUT
 	iftrue .GotCut
 	checkevent EVENT_CLEARED_SLOWPOKE_WELL
 	iftrue .SavedSlowpoke
-	writetext BossSlowpokeText
+	writetext CharcoalKilnBossText1
 	closetext
 	loadmovesprites
 	end
 
 .SavedSlowpoke
-	writetext BossForestText
+	writetext CharcoalKilnBossText2
 	closetext
 	loadmovesprites
 	end
 
 .GotCut
-	writetext BossText
+	writetext CharcoalKilnBossText3
 	closetext
 	loadmovesprites
 	end
 
-ApprenticeScript:
+CharcoalKilnApprentice:
 	faceplayer
 	loadfont
 	checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
-	iftrue UnknownScript_0x18dd5d
+	iftrue .YoureTheCoolest
 	checkevent EVENT_GOT_HM01_CUT
-	iftrue UnknownScript_0x18dd4e
-	writetext UnknownText_0x18dee0
+	iftrue .Thanks
+	writetext CharcoalKilnApprenticeText1
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x18dd4e: ; 0x18dd4e
-	writetext UnknownText_0x18df25
+.Thanks
+	writetext CharcoalKilnApprenticeText2
 	keeptextopen
 	verbosegiveitem CHARCOAL, 1
-	iffalse UnknownScript_0x18dd61
+	iffalse .Done
 	setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
 	loadmovesprites
 	end
-; 0x18dd5d
 
-UnknownScript_0x18dd5d: ; 0x18dd5d
-	writetext UnknownText_0x18df93
+.YoureTheCoolest
+	writetext CharcoalKilnApprenticeText3
 	closetext
-UnknownScript_0x18dd61: ; 0x18dd61
+.Done
 	loadmovesprites
 	end
-; 0x18dd63
 
-FarfetchdScript:
+CharcoalKilnFarfetchd:
 	faceplayer
 	loadfont
 	writetext FarfetchdText
@@ -68,15 +66,13 @@ FarfetchdScript:
 	loadmovesprites
 	end
 
-MapCharcoalKilnSignpost1Script: ; 0x18dd6e
+CharcoalKilnBookshelf:
 	jumpstd magazinebookshelf
-; 0x18dd71
 
-MapCharcoalKilnSignpost2Script: ; 0x18dd71
+CharcoalKilnRadio:
 	jumpstd radio2
-; 0x18dd74
 
-BossSlowpokeText:
+CharcoalKilnBossText1:
 	text "All the SLOWPOKE"
 	line "have disappeared"
 	cont "from the town."
@@ -90,7 +86,7 @@ BossSlowpokeText:
 	cont "stay in."
 	done
 
-BossForestText:
+CharcoalKilnBossText2:
 	text "The SLOWPOKE have"
 	line "returned…"
 
@@ -102,7 +98,7 @@ BossForestText:
 	line "is that lazy guy?"
 	done
 
-BossText:
+CharcoalKilnBossText3:
 	text "You chased off"
 	line "TEAM ROCKET and"
 
@@ -113,18 +109,16 @@ BossText:
 	line "I like that. Come"
 	cont "train with us."
 	done
-; 0x18dee0
 
-UnknownText_0x18dee0: ; 0x18dee0
+CharcoalKilnApprenticeText1:
 	text "Where have all the"
 	line "SLOWPOKE gone?"
 
 	para "Are they out play-"
 	line "ing somewhere?"
 	done
-; 0x18df25
 
-UnknownText_0x18df25: ; 0x18df25
+CharcoalKilnApprenticeText2:
 	text "I'm sorry--I for-"
 	line "got to thank you."
 
@@ -135,9 +129,8 @@ UnknownText_0x18df25: ; 0x18df25
 	line "would be happy to"
 	cont "hold that."
 	done
-; 0x18df93
 
-UnknownText_0x18df93: ; 0x18df93
+CharcoalKilnApprenticeText3:
 	text "The SLOWPOKE came"
 	line "back, and you even"
 	cont "found FARFETCH'D."
@@ -145,7 +138,6 @@ UnknownText_0x18df93: ; 0x18df93
 	para "You're the cool-"
 	line "est, man!"
 	done
-; 0x18dfe5
 
 FarfetchdText:
 	text "FARFETCH'D: Kwaa!"
@@ -165,12 +157,12 @@ CharcoalKiln_MapEventHeader: ; 0x18dff8
 
 	; signposts
 	db 3
-	signpost 1, 0, $0, MapCharcoalKilnSignpost1Script
-	signpost 1, 1, $0, MapCharcoalKilnSignpost1Script
-	signpost 1, 7, $0, MapCharcoalKilnSignpost2Script
+	signpost 1, 0, $0, CharcoalKilnBookshelf
+	signpost 1, 1, $0, CharcoalKilnBookshelf
+	signpost 1, 7, $0, CharcoalKilnRadio
 
 	; people-events
 	db 3
-	person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BossScript, $06f7
-	person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, ApprenticeScript, $06f6
-	person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, FarfetchdScript, $06f5
+	person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, $06f7
+	person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, $06f6
+	person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, $06f5

maps/CherrygroveCity.asm

@@ -27,42 +27,40 @@ UnknownScript_0x19c00f: ; 0x19c00f
 	return
 ; 0x19c013
 
-GrampsScript_0x19c013: ; 0x19c013
+CherrygroveCityGuideGent: ; 0x19c013
 	faceplayer
 	loadfont
-	writetext UnknownText_0x19c1e3
+	writetext GuideGentIntroText
 	yesorno
-	iffalse UnknownScript_0x19c0a4
-	jump UnknownScript_0x19c01f
-; 0x19c01f
-
-UnknownScript_0x19c01f: ; 0x19c01f
-	writetext UnknownText_0x19c26f
+	iffalse .No
+	jump .Yes
+.Yes
+	writetext GuideGentTourText1
 	closetext
 	loadmovesprites
 	playmusic MUSIC_SHOW_ME_AROUND
 	follow $2, $0
 	applymovement $2, MovementData_0x19c195
 	loadfont
-	writetext UnknownText_0x19c285
+	writetext GuideGentPokeCenterText
 	closetext
 	loadmovesprites
 	applymovement $2, MovementData_0x19c19b
 	spriteface $0, $1
 	loadfont
-	writetext UnknownText_0x19c304
+	writetext GuideGentMartText
 	closetext
 	loadmovesprites
 	applymovement $2, MovementData_0x19c1a3
 	spriteface $0, $1
 	loadfont
-	writetext UnknownText_0x19c359
+	writetext GuideGentRoute30Text
 	closetext
 	loadmovesprites
 	applymovement $2, MovementData_0x19c1ac
 	spriteface $0, $2
 	loadfont
-	writetext UnknownText_0x19c3a7
+	writetext GuideGentSeaText
 	closetext
 	loadmovesprites
 	applymovement $2, MovementData_0x19c1b6
@@ -71,14 +69,14 @@ UnknownScript_0x19c01f: ; 0x19c01f
 	spriteface $2, $2
 	spriteface $0, $3
 	loadfont
-	writetext UnknownText_0x19c3ec
+	writetext GuideGentGiftText
 	keeptextopen
 	stringtotext .mapcardname, $1
 	scall .UnknownScript_0x19c097
 	setflag $0001
-	writetext UnknownText_0x19c438
+	writetext GotMapCardText
 	keeptextopen
-	writetext UnknownText_0x19c451
+	writetext GuideGentPokegearText
 	closetext
 	loadmovesprites
 	stopfollow
@@ -99,12 +97,11 @@ UnknownScript_0x19c01f: ; 0x19c01f
 	db "MAP CARD@"
 ; 0x19c0a4
 
-UnknownScript_0x19c0a4: ; 0x19c0a4
-	writetext UnknownText_0x19c49f
+.No
+	writetext GuideGentNoText
 	closetext
 	loadmovesprites
 	end
-; 0x19c0aa
 
 UnknownScript_0x19c0aa: ; 0x19c0aa
 	moveperson $3, $27, $7
@@ -225,7 +222,7 @@ UnknownScript_0x19c168: ; 0x19c168
 	end
 ; 0x19c16e
 
-FisherScript_0x19c16e: ; 0x19c16e
+MysticWaterGuy: ; 0x19c16e
 	faceplayer
 	loadfont
 	checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
@@ -243,21 +240,18 @@ UnknownScript_0x19c187: ; 0x19c187
 	end
 ; 0x19c189
 
-MapCherrygroveCitySignpost0Script: ; 0x19c189
-	jumptext UnknownText_0x19c7e0
-; 0x19c18c
+CherrygroveCitySign:
+	jumptext CherrygroveCitySignText
 
-MapCherrygroveCitySignpost1Script: ; 0x19c18c
-	jumptext UnknownText_0x19c815
+GuideGentsHouseSign: ; 0x19c18c
+	jumptext GuideGentsHouseSignText
 ; 0x19c18f
 
-MapCherrygroveCitySignpost3Script: ; 0x19c18f
+CherrygroveCityPokeCenterSign:
 	jumpstd pokecentersign
-; 0x19c192
 
-MapCherrygroveCitySignpost2Script: ; 0x19c192
+CherrygroveCityMartSign: ; 0x19c192
 	jumpstd martsign
-; 0x19c195
 
 MovementData_0x19c195: ; 0x19c195
 	step_left
@@ -365,9 +359,8 @@ MovementData_0x19c1da: ; 0x19c1da
 	big_step_left
 	big_step_left
 	step_end
-; 0x19c1e3
 
-UnknownText_0x19c1e3: ; 0x19c1e3
+GuideGentIntroText:
 	text "You're a rookie"
 	line "trainer, aren't"
 	cont "you? I can tell!"
@@ -380,15 +373,13 @@ UnknownText_0x19c1e3: ; 0x19c1e3
 	line "can teach you a"
 	cont "few things."
 	done
-; 0x19c26f
 
-UnknownText_0x19c26f: ; 0x19c26f
+GuideGentTourText1:
 	text "OK, then!"
 	line "Follow me!"
 	done
-; 0x19c285
 
-UnknownText_0x19c285: ; 0x19c285
+GuideGentPokeCenterText:
 	text "This is a #MON"
 	line "CENTER. They heal"
 
@@ -401,9 +392,8 @@ UnknownText_0x19c285: ; 0x19c285
 	para "you better learn"
 	line "about them."
 	done
-; 0x19c304
 
-UnknownText_0x19c304: ; 0x19c304
+GuideGentMartText:
 	text "This is a #MON"
 	line "MART."
 
@@ -413,9 +403,8 @@ UnknownText_0x19c304: ; 0x19c304
 	para "#MON and other"
 	line "useful items."
 	done
-; 0x19c359
 
-UnknownText_0x19c359: ; 0x19c359
+GuideGentRoute30Text:
 	text "ROUTE 30 is out"
 	line "this way."
 
@@ -425,9 +414,8 @@ UnknownText_0x19c359: ; 0x19c359
 	para "prized #MON"
 	line "there."
 	done
-; 0x19c3a7
 
-UnknownText_0x19c3a7: ; 0x19c3a7
+GuideGentSeaText:
 	text "This is the sea,"
 	line "as you can see."
 
@@ -435,9 +423,8 @@ UnknownText_0x19c3a7: ; 0x19c3a7
 	line "found only in"
 	cont "water."
 	done
-; 0x19c3ec
 
-UnknownText_0x19c3ec: ; 0x19c3ec
+GuideGentGiftText:
 	text "Here…"
 
 	para "It's my house!"
@@ -447,15 +434,13 @@ UnknownText_0x19c3ec: ; 0x19c3ec
 	para "Let me give you a"
 	line "small gift."
 	done
-; 0x19c438
 
-UnknownText_0x19c438: ; 0x19c438
+GotMapCardText:
 	text $52, "'s #GEAR"
 	line "now has a MAP!"
 	done
-; 0x19c451
 
-UnknownText_0x19c451: ; 0x19c451
+GuideGentPokegearText:
 	text "#GEAR becomes"
 	line "more useful as you"
 	cont "add CARDS."
@@ -463,16 +448,14 @@ UnknownText_0x19c451: ; 0x19c451
 	para "I wish you luck on"
 	line "your journey!"
 	done
-; 0x19c49f
 
-UnknownText_0x19c49f: ; 0x19c49f
+GuideGentNoText:
 	text "Oh… It's something"
 	line "I enjoy doing…"
 
 	para "Fine. Come see me"
 	line "when you like."
 	done
-; 0x19c4e2
 
 UnknownText_0x19c4e2: ; 0x19c4e2
 	text $56, " ", $56, " ", $56
@@ -588,7 +571,7 @@ UnknownText_0x19c7c1: ; 0x19c7c1
 	done
 ; 0x19c7e0
 
-UnknownText_0x19c7e0: ; 0x19c7e0
+CherrygroveCitySignText: ; 0x19c7e0
 	text "CHERRYGROVE CITY"
 
 	para "The City of Cute,"
@@ -596,7 +579,7 @@ UnknownText_0x19c7e0: ; 0x19c7e0
 	done
 ; 0x19c815
 
-UnknownText_0x19c815: ; 0x19c815
+GuideGentsHouseSignText: ; 0x19c815
 	text "GUIDE GENT'S HOUSE"
 	done
 ; 0x19c829
@@ -620,16 +603,16 @@ CherrygroveCity_MapEventHeader: ; 0x19c829
 
 	; signposts
 	db 4
-	signpost 8, 30, $0, MapCherrygroveCitySignpost0Script
-	signpost 9, 23, $0, MapCherrygroveCitySignpost1Script
-	signpost 3, 24, $0, MapCherrygroveCitySignpost2Script
-	signpost 3, 30, $0, MapCherrygroveCitySignpost3Script
+	signpost 8, 30, $0, CherrygroveCitySign
+	signpost 9, 23, $0, GuideGentsHouseSign
+	signpost 3, 24, $0, CherrygroveCityMartSign
+	signpost 3, 30, $0, CherrygroveCityPokeCenterSign
 
 	; people-events
 	db 5
-	person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, GrampsScript_0x19c013, $06fe
+	person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, $06fe
 	person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be
 	person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, $ffff
 	person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff
-	person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, FisherScript_0x19c16e, $ffff
+	person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, $ffff
 ; 0x19c8ad