Clean up gym leader scripts.

17 files changed, 576 insertions, 1032 deletions

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index d2e4b8ffd..a36e0273f 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -268,6 +268,7 @@ EVENT_BEAT_CAMPER_ROLAND                               EQU $41a
 EVENT_BEAT_CAMPER_TODD_1                               EQU $41b
 EVENT_BEAT_CAMPER_IVAN                                 EQU $41c
 EVENT_BEAT_CAMPER_ELLIOT                               EQU $41d
+EVENT_BEAT_CAMPER_BARRY                                EQU $41e
 EVENT_BEAT_CAMPER_LLOYD                                EQU $41f
 EVENT_BEAT_CAMPER_DEAN                                 EQU $420
 EVENT_BEAT_CAMPER_SID                                  EQU $421
@@ -338,6 +339,7 @@ EVENT_BEAT_PICNICKER_LIZ_1                             EQU $47e
 EVENT_BEAT_PICNICKER_GINA_1                            EQU $47f
 EVENT_BEAT_PICNICKER_BROOKE                            EQU $480
 EVENT_BEAT_PICNICKER_KIM                               EQU $481
+EVENT_BEAT_PICNICKER_CINDY                             EQU $482
 EVENT_BEAT_PICNICKER_HOPE                              EQU $483
 EVENT_BEAT_PICNICKER_SHARON                            EQU $484
 EVENT_BEAT_PICNICKER_DEBRA                             EQU $485
@@ -382,8 +384,10 @@ EVENT_BEAT_CLAIR                                       EQU $4c4
 EVENT_BEAT_BROCK                                       EQU $4c5
 EVENT_BEAT_MISTY                                       EQU $4c6
 EVENT_BEAT_LTSURGE                                     EQU $4c7
+EVENT_BEAT_ERIKA                                       EQU $4c8
 EVENT_BEAT_JANINE                                      EQU $4c9
 EVENT_BEAT_SABRINA                                     EQU $4ca
+EVENT_BEAT_BLAINE                                      EQU $4cb
 EVENT_BEAT_BLUE                                        EQU $4cc
 EVENT_BEAT_POKEFANM_WILLIAM                            EQU $4cd
 EVENT_BEAT_POKEFANM_DEREK                              EQU $4ce
@@ -443,8 +447,10 @@ EVENT_BEAT_ROCKET_GRUNTF_4                             EQU $513
 EVENT_BEAT_ROCKET_GRUNTF_5                             EQU $514
 EVENT_BEAT_LASS_CARRIE                                 EQU $515
 EVENT_BEAT_LASS_BRIDGET                                EQU $516
+EVENT_BEAT_LASS_ALICE                                  EQU $517
 EVENT_BEAT_LASS_KRISE                                  EQU $518
 EVENT_BEAT_LASS_CONNIE_1                               EQU $519
+EVENT_BEAT_LASS_LINDA                                  EQU $51a
 EVENT_BEAT_LASS_LAURA                                  EQU $51b
 EVENT_BEAT_LASS_SHANNON                                EQU $51c
 EVENT_BEAT_LASS_MICHELLE                               EQU $51d
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 7b58c5610..f8044174d 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,16 +1,15 @@
-AzaleaGym_MapScriptHeader: ; 0x18ec1c
+AzaleaGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x18ec1e
 
-BugsyScript_0x18ec1e: ; 0x18ec1e
+BugsyScript_0x18ec1e:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_BUGSY
-	iftrue UnknownScript_0x18ec48
+	iftrue .FightDone
 	writetext UnknownText_0x18ed0b
 	closetext
 	loadmovesprites
@@ -23,10 +22,10 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
 	writetext UnknownText_0x18ee14
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $001c
+	setflag ENGINE_HIVEBADGE
 	checkcode VAR_BADGES
-	scall UnknownScript_0x18ec73
-UnknownScript_0x18ec48: ; 0x18ec48
+	scall AzaleaGymTriggerRockets
+.FightDone
 	checkevent EVENT_GOT_TM49_FURY_CUTTER
 	iftrue UnknownScript_0x18ec6d
 	setevent EVENT_BEAT_TWINS_AMY_AND_MAY
@@ -42,31 +41,26 @@ UnknownScript_0x18ec48: ; 0x18ec48
 	closetext
 	loadmovesprites
 	end
-; 0x18ec6d
 
-UnknownScript_0x18ec6d: ; 0x18ec6d
+UnknownScript_0x18ec6d:
 	writetext UnknownText_0x18ef98
 	closetext
-UnknownScript_0x18ec71: ; 0x18ec71
+UnknownScript_0x18ec71:
 	loadmovesprites
 	end
-; 0x18ec73
 
-UnknownScript_0x18ec73: ; 0x18ec73
-	if_equal $7, UnknownScript_0x18ec7f
-	if_equal $6, UnknownScript_0x18ec7c
+AzaleaGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x18ec7c
 
-UnknownScript_0x18ec7c: ; 0x18ec7c
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x18ec7f
 
-UnknownScript_0x18ec7f: ; 0x18ec7f
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x18ec82
 
-TrainerTwinsAmyandmay1: ; 0x18ec82
+TrainerTwinsAmyandmay1:
 	; bit/flag number
 	dw $464
 
@@ -84,18 +78,16 @@ TrainerTwinsAmyandmay1: ; 0x18ec82
 
 	; script when talk again
 	dw TwinsAmyandmay1Script
-; 0x18ec8e
 
-TwinsAmyandmay1Script: ; 0x18ec8e
+TwinsAmyandmay1Script:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f1fc
 	closetext
 	loadmovesprites
 	end
-; 0x18ec96
 
-TrainerTwinsAmyandmay2: ; 0x18ec96
+TrainerTwinsAmyandmay2:
 	; bit/flag number
 	dw $464
 
@@ -113,18 +105,16 @@ TrainerTwinsAmyandmay2: ; 0x18ec96
 
 	; script when talk again
 	dw TwinsAmyandmay2Script
-; 0x18eca2
 
-TwinsAmyandmay2Script: ; 0x18eca2
+TwinsAmyandmay2Script:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f269
 	closetext
 	loadmovesprites
 	end
-; 0x18ecaa
 
-TrainerBug_catcherBug_catcher_benny: ; 0x18ecaa
+TrainerBug_catcherBug_catcher_benny:
 	; bit/flag number
 	dw $53c
 
@@ -142,18 +132,16 @@ TrainerBug_catcherBug_catcher_benny: ; 0x18ecaa
 
 	; script when talk again
 	dw Bug_catcherBug_catcher_bennyScript
-; 0x18ecb6
 
-Bug_catcherBug_catcher_bennyScript: ; 0x18ecb6
+Bug_catcherBug_catcher_bennyScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f053
 	closetext
 	loadmovesprites
 	end
-; 0x18ecbe
 
-TrainerBug_catcherAl: ; 0x18ecbe
+TrainerBug_catcherAl:
 	; bit/flag number
 	dw $53d
 
@@ -171,18 +159,16 @@ TrainerBug_catcherAl: ; 0x18ecbe
 
 	; script when talk again
 	dw Bug_catcherAlScript
-; 0x18ecca
 
-Bug_catcherAlScript: ; 0x18ecca
+Bug_catcherAlScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f0d3
 	closetext
 	loadmovesprites
 	end
-; 0x18ecd2
 
-TrainerBug_catcherJosh: ; 0x18ecd2
+TrainerBug_catcherJosh:
 	; bit/flag number
 	dw $53e
 
@@ -200,18 +186,16 @@ TrainerBug_catcherJosh: ; 0x18ecd2
 
 	; script when talk again
 	dw Bug_catcherJoshScript
-; 0x18ecde
 
-Bug_catcherJoshScript: ; 0x18ecde
+Bug_catcherJoshScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18f17e
 	closetext
 	loadmovesprites
 	end
-; 0x18ece6
 
-AzaleaGymGuyScript: ; 0x18ece6
+AzaleaGymGuyScript:
 	faceplayer
 	checkevent EVENT_BEAT_BUGSY
 	iftrue .AzaleaGymGuyWinScript
@@ -227,7 +211,6 @@ AzaleaGymGuyScript: ; 0x18ece6
 	closetext
 	loadmovesprites
 	end
-; 0x18ecfb
 
 AzaleaGymStatue:
 	checkflag ENGINE_HIVEBADGE
@@ -237,7 +220,7 @@ AzaleaGymStatue:
 	trainertotext BUGSY, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x18ed0b: ; 0x18ed0b
+UnknownText_0x18ed0b:
 	text "I'm BUGSY!"
 	line "I never lose when"
 
@@ -254,9 +237,8 @@ UnknownText_0x18ed0b: ; 0x18ed0b
 	line "what I've learned"
 	cont "from my studies."
 	done
-; 0x18edae
 
-UnknownText_0x18edae: ; 0x18edae
+UnknownText_0x18edae:
 	text "Whoa, amazing!"
 	line "You're an expert"
 	cont "on #MON!"
@@ -267,15 +249,13 @@ UnknownText_0x18edae: ; 0x18edae
 	para "OK, you win. Take"
 	line "this BADGE."
 	done
-; 0x18ee14
 
-UnknownText_0x18ee14: ; 0x18ee14
+UnknownText_0x18ee14:
 	text "<PLAYER> received"
 	line "HIVEBADGE."
 	done
-; 0x18ee2b
 
-UnknownText_0x18ee2b: ; 0x18ee2b
+UnknownText_0x18ee2b:
 	text "Do you know the"
 	line "benefits of HIVE-"
 	cont "BADGE?"
@@ -295,9 +275,8 @@ UnknownText_0x18ee2b: ; 0x18ee2b
 	para "Here, I also want"
 	line "you to have this."
 	done
-; 0x18eefa
 
-UnknownText_0x18eefa: ; 0x18eefa
+UnknownText_0x18eefa:
 	text "TM49 contains"
 	line "FURY CUTTER."
 
@@ -312,9 +291,8 @@ UnknownText_0x18eefa: ; 0x18eefa
 	para "Isn't that great?"
 	line "I discovered it!"
 	done
-; 0x18ef98
 
-UnknownText_0x18ef98: ; 0x18ef98
+UnknownText_0x18ef98:
 	text "Bug #MON are"
 	line "deep. There are"
 
@@ -324,46 +302,40 @@ UnknownText_0x18ef98: ; 0x18ef98
 	para "Study your favor-"
 	line "ites thoroughly."
 	done
-; 0x18eff8
 
-Bug_catcherBug_catcher_bennySeenText: ; 0x18eff8
+Bug_catcherBug_catcher_bennySeenText:
 	text "Bug #MON evolve"
 	line "young. So they get"
 
 	para "stronger that much"
 	line "faster."
 	done
-; 0x18f037
 
-Bug_catcherBug_catcher_bennyBeatenText: ; 0x18f037
+Bug_catcherBug_catcher_bennyBeatenText:
 	text "Just evolving"
 	line "isn't enough!"
 	done
-; 0x18f053
 
-UnknownText_0x18f053: ; 0x18f053
+UnknownText_0x18f053:
 	text "#MON become"
 	line "stronger if they"
 	cont "evolve. Really!"
 	done
-; 0x18f081
 
-Bug_catcherAlSeenText: ; 0x18f081
+Bug_catcherAlSeenText:
 	text "Bug #MON are"
 	line "cool and tough!"
 
 	para "I'll prove it to"
 	line "you!"
 	done
-; 0x18f0b4
 
-Bug_catcherAlBeatenText: ; 0x18f0b4
+Bug_catcherAlBeatenText:
 	text "You proved how"
 	line "tough you are…"
 	done
-; 0x18f0d3
 
-UnknownText_0x18f0d3: ; 0x18f0d3
+UnknownText_0x18f0d3:
 	text "They're so cool,"
 	line "but most girls"
 
@@ -372,9 +344,8 @@ UnknownText_0x18f0d3: ; 0x18f0d3
 
 	para "I don't know why…"
 	done
-; 0x18f118
 
-Bug_catcherJoshSeenText: ; 0x18f118
+Bug_catcherJoshSeenText:
 	text "You saved all the"
 	line "SLOWPOKE? Whew,"
 	cont "you're mighty!"
@@ -383,60 +354,51 @@ Bug_catcherJoshSeenText: ; 0x18f118
 	line "#MON are pretty"
 	cont "tough too!"
 	done
-; 0x18f174
 
-Bug_catcherJoshBeatenText: ; 0x18f174
+Bug_catcherJoshBeatenText:
 	text "Urrgggh!"
 	done
-; 0x18f17e
 
-UnknownText_0x18f17e: ; 0x18f17e
+UnknownText_0x18f17e:
 	text "I guess I should"
 	line "teach them better"
 	cont "moves…"
 	done
-; 0x18f1a9
 
-TwinsAmyandmay1SeenText: ; 0x18f1a9
+TwinsAmyandmay1SeenText:
 	text "AMY: Hi! Are you"
 	line "challenging the"
 	cont "LEADER? No way!"
 	done
-; 0x18f1db
 
-TwinsAmyandmay1BeatenText: ; 0x18f1db
+TwinsAmyandmay1BeatenText:
 	text "AMY & MAY: Oh,"
 	line "double goodness!"
 	done
-; 0x18f1fc
 
-UnknownText_0x18f1fc: ; 0x18f1fc
+UnknownText_0x18f1fc:
 	text "AMY: You're"
 	line "really strong!"
 	done
-; 0x18f217
 
-TwinsAmyandmay2SeenText: ; 0x18f217
+TwinsAmyandmay2SeenText:
 	text "MAY: You want to"
 	line "see the LEADER?"
 	cont "We come first!"
 	done
-; 0x18f248
 
-TwinsAmyandmay2BeatenText: ; 0x18f248
+TwinsAmyandmay2BeatenText:
 	text "AMY & MAY: Oh,"
 	line "double goodness!"
 	done
-; 0x18f269
 
-UnknownText_0x18f269: ; 0x18f269
+UnknownText_0x18f269:
 	text "MAY: Our bug #-"
 	line "MON lost! Oh, what"
 	cont "a shame."
 	done
-; 0x18f296
 
-AzaleaGymGuyText: ; 0x18f296
+AzaleaGymGuyText:
 	text "Yo, challenger!"
 
 	para "BUGSY's young, but"
@@ -457,9 +419,8 @@ AzaleaGymGuyText: ; 0x18f296
 	line "are super-effec-"
 	cont "tive too."
 	done
-; 0x18f359
 
-AzaleaGymGuyWinText: ; 0x18f359
+AzaleaGymGuyWinText:
 	text "Well done! That"
 	line "was a great clash"
 
@@ -470,9 +431,8 @@ AzaleaGymGuyWinText: ; 0x18f359
 	line "you, the future of"
 	cont "#MON is bright!"
 	done
-; 0x18f3cc
 
-AzaleaGym_MapEventHeader: ; 0x18f3cc
+AzaleaGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -498,4 +458,3 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc
 	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff
 	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff
 	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff
-; 0x18f441
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 55b9c0cda..e28bc95ab 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -26,10 +26,10 @@ BlackthornGym1F_MapScriptHeader:
 ClairScript_0x194e24:
 	faceplayer
 	loadfont
-	checkflag $0022
+	checkflag ENGINE_RISINGBADGE
 	iftrue UnknownScript_0x194e69
 	checkevent EVENT_BEAT_CLAIR
-	iftrue UnknownScript_0x194e63
+	iftrue .FightDone
 	writetext UnknownText_0x194efa
 	closetext
 	loadmovesprites
@@ -51,8 +51,7 @@ ClairScript_0x194e24:
 	setevent $074c
 	clearevent $074d
 	end
-
-UnknownScript_0x194e63:
+.FightDone
 	writetext UnknownText_0x195162
 	closetext
 	loadmovesprites
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 8439ecaf8..07e6ac36e 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -1,16 +1,15 @@
-CeladonGym_MapScriptHeader: ; 0x72a68
+CeladonGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x72a6a
 
-ErikaScript_0x72a6a: ; 0x72a6a
+ErikaScript_0x72a6a:
 	faceplayer
 	loadfont
-	checkflag $0026
-	iftrue UnknownScript_0x72a9b
+	checkflag ENGINE_RAINBOWBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x72b28
 	closetext
 	loadmovesprites
@@ -18,7 +17,7 @@ ErikaScript_0x72a6a: ; 0x72a6a
 	loadtrainer ERIKA, 1
 	startbattle
 	returnafterbattle
-	setevent $04c8
+	setevent EVENT_BEAT_ERIKA
 	setevent EVENT_BEAT_LASS_MICHELLE
 	setevent EVENT_BEAT_PICNICKER_TANYA
 	setevent EVENT_BEAT_BEAUTY_JULIA
@@ -27,8 +26,8 @@ ErikaScript_0x72a6a: ; 0x72a6a
 	writetext UnknownText_0x72c96
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0026
-UnknownScript_0x72a9b: ; 0x72a9b
+	setflag ENGINE_RAINBOWBADGE
+.FightDone
 	checkevent EVENT_GOT_TM19_GIGA_DRAIN
 	iftrue UnknownScript_0x72aae
 	writetext UnknownText_0x72cb0
@@ -36,14 +35,13 @@ UnknownScript_0x72a9b: ; 0x72a9b
 	verbosegiveitem TM_GIGA_DRAIN, 1
 	iffalse UnknownScript_0x72aae
 	setevent EVENT_GOT_TM19_GIGA_DRAIN
-UnknownScript_0x72aae: ; 0x72aae
+UnknownScript_0x72aae:
 	writetext UnknownText_0x72d8f
 	closetext
 	loadmovesprites
 	end
-; 0x72ab4
 
-TrainerLassMichelle: ; 0x72ab4
+TrainerLassMichelle:
 	; bit/flag number
 	dw $51d
 
@@ -61,18 +59,16 @@ TrainerLassMichelle: ; 0x72ab4
 
 	; script when talk again
 	dw LassMichelleScript
-; 0x72ac0
 
-LassMichelleScript: ; 0x72ac0
+LassMichelleScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x72e30
 	closetext
 	loadmovesprites
 	end
-; 0x72ac8
 
-TrainerPicnickerTanya: ; 0x72ac8
+TrainerPicnickerTanya:
 	; bit/flag number
 	dw $490
 
@@ -90,18 +86,16 @@ TrainerPicnickerTanya: ; 0x72ac8
 
 	; script when talk again
 	dw PicnickerTanyaScript
-; 0x72ad4
 
-PicnickerTanyaScript: ; 0x72ad4
+PicnickerTanyaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x72e8e
 	closetext
 	loadmovesprites
 	end
-; 0x72adc
 
-TrainerBeautyJulia: ; 0x72adc
+TrainerBeautyJulia:
 	; bit/flag number
 	dw $4ba
 
@@ -119,18 +113,16 @@ TrainerBeautyJulia: ; 0x72adc
 
 	; script when talk again
 	dw BeautyJuliaScript
-; 0x72ae8
 
-BeautyJuliaScript: ; 0x72ae8
+BeautyJuliaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x72f01
 	closetext
 	loadmovesprites
 	end
-; 0x72af0
 
-TrainerTwinsJoandzoe1: ; 0x72af0
+TrainerTwinsJoandzoe1:
 	; bit/flag number
 	dw $468
 
@@ -148,18 +140,16 @@ TrainerTwinsJoandzoe1: ; 0x72af0
 
 	; script when talk again
 	dw TwinsJoandzoe1Script
-; 0x72afc
 
-TwinsJoandzoe1Script: ; 0x72afc
+TwinsJoandzoe1Script:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x72f70
 	closetext
 	loadmovesprites
 	end
-; 0x72b04
 
-TrainerTwinsJoandzoe2: ; 0x72b04
+TrainerTwinsJoandzoe2:
 	; bit/flag number
 	dw $468
 
@@ -177,16 +167,14 @@ TrainerTwinsJoandzoe2: ; 0x72b04
 
 	; script when talk again
 	dw TwinsJoandzoe2Script
-; 0x72b10
 
-TwinsJoandzoe2Script: ; 0x72b10
+TwinsJoandzoe2Script:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x72fc0
 	closetext
 	loadmovesprites
 	end
-; 0x72b18
 
 CeladonGymStatue:
 	checkflag ENGINE_RAINBOWBADGE
@@ -196,7 +184,7 @@ CeladonGymStatue:
 	trainertotext ERIKA, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x72b28: ; 0x72b28
+UnknownText_0x72b28:
 	text "ERIKA: Hello…"
 	line "Lovely weather,"
 
@@ -223,9 +211,8 @@ UnknownText_0x72b28: ; 0x72b28
 	para "Very well, but I"
 	line "shall not lose."
 	done
-; 0x72c3e
 
-UnknownText_0x72c3e: ; 0x72c3e
+UnknownText_0x72c3e:
 	text "ERIKA: Oh!"
 	line "I concede defeat…"
 
@@ -235,15 +222,13 @@ UnknownText_0x72c3e: ; 0x72c3e
 	para "I shall give you"
 	line "RAINBOWBADGE…"
 	done
-; 0x72c96
 
-UnknownText_0x72c96: ; 0x72c96
+UnknownText_0x72c96:
 	text "<PLAYER> received"
 	line "RAINBOWBADGE."
 	done
-; 0x72cb0
 
-UnknownText_0x72cb0: ; 0x72cb0
+UnknownText_0x72cb0:
 	text "ERIKA: That was a"
 	line "delightful match."
 
@@ -263,9 +248,8 @@ UnknownText_0x72cb0: ; 0x72cb0
 	para "Please use it if"
 	line "it pleases you…"
 	done
-; 0x72d8f
 
-UnknownText_0x72d8f: ; 0x72d8f
+UnknownText_0x72d8f:
 	text "ERIKA: Losing"
 	line "leaves a bitter"
 	cont "aftertaste…"
@@ -276,102 +260,86 @@ UnknownText_0x72d8f: ; 0x72d8f
 	para "trainers spurs me"
 	line "to do better…"
 	done
-; 0x72dfc
 
-LassMichelleSeenText: ; 0x72dfc
+LassMichelleSeenText:
 	text "Do you think a"
 	line "girls-only GYM"
 	cont "is rare?"
 	done
-; 0x72e24
 
-LassMichelleBeatenText: ; 0x72e24
+LassMichelleBeatenText:
 	text "Oh, bleah!"
 	done
-; 0x72e30
 
-UnknownText_0x72e30: ; 0x72e30
+UnknownText_0x72e30:
 	text "I just got care-"
 	line "less, that's all!"
 	done
-; 0x72e53
 
-PicnickerTanyaSeenText: ; 0x72e53
+PicnickerTanyaSeenText:
 	text "Oh, a battle?"
 	line "That's kind of"
 	cont "scary, but OK!"
 	done
-; 0x72e7f
 
-PicnickerTanyaBeatenText: ; 0x72e7f
+PicnickerTanyaBeatenText:
 	text "Oh, that's it?"
 	done
-; 0x72e8e
 
-UnknownText_0x72e8e: ; 0x72e8e
+UnknownText_0x72e8e:
 	text "Oh, look at all"
 	line "your BADGES. No"
 
 	para "wonder I couldn't"
 	line "win!"
 	done
-; 0x72ec5
 
-BeautyJuliaSeenText: ; 0x72ec5
+BeautyJuliaSeenText:
 	text "Were you looking"
 	line "at these flowers"
 	cont "or at me?"
 	done
-; 0x72ef2
 
-BeautyJuliaBeatenText: ; 0x72ef2
+BeautyJuliaBeatenText:
 	text "How annoying!"
 	done
-; 0x72f01
 
-UnknownText_0x72f01: ; 0x72f01
+UnknownText_0x72f01:
 	text "How do I go about"
 	line "becoming ladylike"
 	cont "like ERIKA?"
 	done
-; 0x72f32
 
-TwinsJoandzoe1SeenText: ; 0x72f32
+TwinsJoandzoe1SeenText:
 	text "We'll show you"
 	line "#MON moves that"
 	cont "ERIKA taught us!"
 	done
-; 0x72f62
 
-TwinsJoandzoe1BeatenText: ; 0x72f62
+TwinsJoandzoe1BeatenText:
 	text "Oh… We lost…"
 	done
-; 0x72f70
 
-UnknownText_0x72f70: ; 0x72f70
+UnknownText_0x72f70:
 	text "ERIKA will get you"
 	line "back for us!"
 	done
-; 0x72f91
 
-TwinsJoandzoe2SeenText: ; 0x72f91
+TwinsJoandzoe2SeenText:
 	text "We're going to"
 	line "protect ERIKA!"
 	done
-; 0x72faf
 
-TwinsJoandzoe2BeatenText: ; 0x72faf
+TwinsJoandzoe2BeatenText:
 	text "We couldn't win…"
 	done
-; 0x72fc0
 
-UnknownText_0x72fc0: ; 0x72fc0
+UnknownText_0x72fc0:
 	text "ERIKA is much,"
 	line "much stronger!"
 	done
-; 0x72fdf
 
-CeladonGym_MapEventHeader: ; 0x72fdf
+CeladonGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -396,4 +364,3 @@ CeladonGym_MapEventHeader: ; 0x72fdf
 	person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff
 	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff
 	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff
-; 0x73047
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 03732de46..a97ce6914 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,4 +1,4 @@
-CeruleanGym_MapScriptHeader: ; 0x1883cf
+CeruleanGym_MapScriptHeader:
 	; trigger count
 	db 2
 
@@ -8,18 +8,15 @@ CeruleanGym_MapScriptHeader: ; 0x1883cf
 
 	; callback count
 	db 0
-; 0x1883d9
 
-UnknownScript_0x1883d9: ; 0x1883d9
+UnknownScript_0x1883d9:
 	end
-; 0x1883da
 
-UnknownScript_0x1883da: ; 0x1883da
+UnknownScript_0x1883da:
 	priorityjump UnknownScript_0x1883de
 	end
-; 0x1883de
 
-UnknownScript_0x1883de: ; 0x1883de
+UnknownScript_0x1883de:
 	applymovement $2, MovementData_0x1884e3
 	playsound SFX_TACKLE
 	applymovement $2, MovementData_0x1884eb
@@ -54,13 +51,12 @@ UnknownScript_0x1883de: ; 0x1883de
 	spriteface $0, DOWN
 	pause 15
 	end
-; 0x188432
 
-MistyScript_0x188432: ; 0x188432
+MistyScript_0x188432:
 	faceplayer
 	loadfont
-	checkflag $0024
-	iftrue UnknownScript_0x188460
+	checkflag ENGINE_CASCADEBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x188674
 	closetext
 	loadmovesprites
@@ -76,15 +72,14 @@ MistyScript_0x188432: ; 0x188432
 	writetext UnknownText_0x188768
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0024
-UnknownScript_0x188460: ; 0x188460
+	setflag ENGINE_CASCADEBADGE
+.FightDone
 	writetext UnknownText_0x188782
 	closetext
 	loadmovesprites
 	end
-; 0x188466
 
-TrainerSwimmerfDiana: ; 0x188466
+TrainerSwimmerfDiana:
 	; bit/flag number
 	dw $3f9
 
@@ -102,18 +97,16 @@ TrainerSwimmerfDiana: ; 0x188466
 
 	; script when talk again
 	dw SwimmerfDianaScript
-; 0x188472
 
-SwimmerfDianaScript: ; 0x188472
+SwimmerfDianaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x188856
 	closetext
 	loadmovesprites
 	end
-; 0x18847a
 
-TrainerSwimmerfBriana: ; 0x18847a
+TrainerSwimmerfBriana:
 	; bit/flag number
 	dw $3fa
 
@@ -131,18 +124,16 @@ TrainerSwimmerfBriana: ; 0x18847a
 
 	; script when talk again
 	dw SwimmerfBrianaScript
-; 0x188486
 
-SwimmerfBrianaScript: ; 0x188486
+SwimmerfBrianaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1888c0
 	closetext
 	loadmovesprites
 	end
-; 0x18848e
 
-TrainerSwimmermParker: ; 0x18848e
+TrainerSwimmermParker:
 	; bit/flag number
 	dw $5a8
 
@@ -160,18 +151,16 @@ TrainerSwimmermParker: ; 0x18848e
 
 	; script when talk again
 	dw SwimmermParkerScript
-; 0x18849a
 
-SwimmermParkerScript: ; 0x18849a
+SwimmermParkerScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x188943
 	closetext
 	loadmovesprites
 	end
-; 0x1884a2
 
-CeruleanGymGuyScript: ; 0x1884a2
+CeruleanGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_MISTY
@@ -186,13 +175,11 @@ CeruleanGymGuyScript: ; 0x1884a2
 	closetext
 	loadmovesprites
 	end
-; 0x1884b6
 
-MapCeruleanGymSignpostItem0: ; 0x1884b6
+MapCeruleanGymSignpostItem0:
 	dw $00fb
 	db MACHINE_PART
 	
-; 0x1884b9
 
 CeruleanGymStatue1:
 	checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -220,21 +207,19 @@ CeruleanGymStatue:
 	trainertotext MISTY, 1, $1
 	jumpstd gymstatue2
 
-MovementData_0x1884e3: ; 0x1884e3
+MovementData_0x1884e3:
 	big_step_down
 	big_step_down
 	big_step_down
 	big_step_down
 	step_end
-; 0x1884e8
 
-MovementData_0x1884e8: ; 0x1884e8
+MovementData_0x1884e8:
 	big_step_right
 	big_step_down
 	step_end
-; 0x1884eb
 
-MovementData_0x1884eb: ; 0x1884eb
+MovementData_0x1884eb:
 	fix_facing
 	db $39 ; movement
 	jump_step_up
@@ -245,21 +230,18 @@ MovementData_0x1884eb: ; 0x1884eb
 	step_down
 	step_down
 	step_end
-; 0x1884f5
 
-MovementData_0x1884f5: ; 0x1884f5
+MovementData_0x1884f5:
 	big_step_down
 	step_end
-; 0x1884f7
 
-MovementData_0x1884f7: ; 0x1884f7
+MovementData_0x1884f7:
 	fix_facing
 	slow_step_up
 	remove_fixed_facing
 	step_end
-; 0x1884fb
 
-UnknownText_0x1884fb: ; 0x1884fb
+UnknownText_0x1884fb:
 	text "Oops! I so sorry!"
 	line "You not hurt,"
 	cont "okay?"
@@ -270,16 +252,14 @@ UnknownText_0x1884fb: ; 0x1884fb
 	cont "good for me if"
 	cont "seen by somebody."
 	done
-; 0x188574
 
-UnknownText_0x188574: ; 0x188574
+UnknownText_0x188574:
 	text "Oh no! You seen"
 	line "me already! I make"
 	cont "big mistake!"
 	done
-; 0x1885a5
 
-UnknownText_0x1885a5: ; 0x1885a5
+UnknownText_0x1885a5:
 	text "Hey, you! Forget"
 	line "you see me, okay?"
 
@@ -291,7 +271,6 @@ UnknownText_0x1885a5: ; 0x1885a5
 
 	para "Bye-bye a go-go!"
 	done
-; 0x188610
 
 CeruleanGymNote1:
 	text "Sorry, I'll be out"
@@ -305,7 +284,7 @@ CeruleanGymNote2:
 	cont "GYM TRAINERS"
 	done
 
-UnknownText_0x188674: ; 0x188674
+UnknownText_0x188674:
 	text "MISTY: I was ex-"
 	line "pecting you, you"
 	cont "pest!"
@@ -320,9 +299,8 @@ UnknownText_0x188674: ; 0x188674
 	para "My water-type"
 	line "#MON are tough!"
 	done
-; 0x18870c
 
-UnknownText_0x18870c: ; 0x18870c
+UnknownText_0x18870c:
 	text "MISTY: You really"
 	line "are good…"
 
@@ -332,15 +310,13 @@ UnknownText_0x18870c: ; 0x18870c
 	para "Here you go. It's"
 	line "CASCADEBADGE."
 	done
-; 0x188768
 
-UnknownText_0x188768: ; 0x188768
+UnknownText_0x188768:
 	text "<PLAYER> received"
 	line "CASCADEBADGE."
 	done
-; 0x188782
 
-UnknownText_0x188782: ; 0x188782
+UnknownText_0x188782:
 	text "MISTY: Are there"
 	line "many strong train-"
 	cont "ers in JOHTO? Like"
@@ -352,41 +328,35 @@ UnknownText_0x188782: ; 0x188782
 	para "I can battle some"
 	line "skilled trainers."
 	done
-; 0x18880a
 
-SwimmerfDianaSeenText: ; 0x18880a
+SwimmerfDianaSeenText:
 	text "Sorry about being"
 	line "away. Let's get on"
 	cont "with it!"
 	done
-; 0x188838
 
-SwimmerfDianaBeatenText: ; 0x188838
+SwimmerfDianaBeatenText:
 	text "I give up! You're"
 	line "the winner!"
 	done
-; 0x188856
 
-UnknownText_0x188856: ; 0x188856
+UnknownText_0x188856:
 	text "I'll be swimming"
 	line "quietly."
 	done
-; 0x188870
 
-SwimmerfBrianaSeenText: ; 0x188870
+SwimmerfBrianaSeenText:
 	text "Don't let my ele-"
 	line "gant swimming un-"
 	cont "nerve you."
 	done
-; 0x18889f
 
-SwimmerfBrianaBeatenText: ; 0x18889f
+SwimmerfBrianaBeatenText:
 	text "Ooh, you calmly"
 	line "disposed of me…"
 	done
-; 0x1888c0
 
-UnknownText_0x1888c0: ; 0x1888c0
+UnknownText_0x1888c0:
 	text "Don't be too smug"
 	line "about beating me."
 
@@ -394,22 +364,19 @@ UnknownText_0x1888c0: ; 0x1888c0
 	line "you if you get"
 	cont "complacent."
 	done
-; 0x188912
 
-SwimmermParkerSeenText: ; 0x188912
+SwimmermParkerSeenText:
 	text "Glub…"
 
 	para "I'm first! Come"
 	line "and get me!"
 	done
-; 0x188934
 
-SwimmermParkerBeatenText: ; 0x188934
+SwimmermParkerBeatenText:
 	text "This can't be…"
 	done
-; 0x188943
 
-UnknownText_0x188943: ; 0x188943
+UnknownText_0x188943:
 	text "MISTY has gotten"
 	line "much better in the"
 	cont "past few years."
@@ -418,9 +385,8 @@ UnknownText_0x188943: ; 0x188943
 	line "guard down, or"
 	cont "you'll be crushed!"
 	done
-; 0x1889a7
 
-CeruleanGymGuyText: ; 0x1889a7
+CeruleanGymGuyText:
 	text "Yo! CHAMP in"
 	line "making!"
 
@@ -430,9 +396,8 @@ CeruleanGymGuyText: ; 0x1889a7
 	para "for some fun too."
 	line "He-he-he."
 	done
-; 0x1889fa
 
-CeruleanGymGuyWinText: ; 0x1889fa
+CeruleanGymGuyWinText:
 	text "Hoo, you showed me"
 	line "how tough you are."
 
@@ -440,9 +405,8 @@ CeruleanGymGuyWinText: ; 0x1889fa
 	line "was one heck of a"
 	cont "great battle!"
 	done
-; 0x188a51
 
-CeruleanGym_MapEventHeader: ; 0x188a51
+CeruleanGym_MapEventHeader:
 	; filler
 	db 0, 0
 
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 3d97085f4..129fc1449 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -1,16 +1,15 @@
-CianwoodGym_MapScriptHeader: ; 0x9d60d
+CianwoodGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x9d60f
 
-ChuckScript_0x9d60f: ; 0x9d60f
+ChuckScript_0x9d60f:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_CHUCK
-	iftrue UnknownScript_0x9d656
+	iftrue .FightDone
 	writetext UnknownText_0x9d6f9
 	closetext
 	loadmovesprites
@@ -38,10 +37,10 @@ ChuckScript_0x9d60f: ; 0x9d60f
 	writetext UnknownText_0x9d835
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0020
+	setflag ENGINE_STORMBADGE
 	checkcode VAR_BADGES
-	scall UnknownScript_0x9d681
-UnknownScript_0x9d656: ; 0x9d656
+	scall CianwoodGymTriggerRockets
+.FightDone
 	checkevent EVENT_GOT_TM01_DYNAMICPUNCH
 	iftrue UnknownScript_0x9d67b
 	setevent EVENT_BEAT_BLACKBELT_YOSHI
@@ -57,31 +56,26 @@ UnknownScript_0x9d656: ; 0x9d656
 	closetext
 	loadmovesprites
 	end
-; 0x9d67b
 
-UnknownScript_0x9d67b: ; 0x9d67b
+UnknownScript_0x9d67b:
 	writetext UnknownText_0x9d930
 	closetext
-UnknownScript_0x9d67f: ; 0x9d67f
+UnknownScript_0x9d67f:
 	loadmovesprites
 	end
-; 0x9d681
 
-UnknownScript_0x9d681: ; 0x9d681
-	if_equal $7, UnknownScript_0x9d68d
-	if_equal $6, UnknownScript_0x9d68a
+CianwoodGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x9d68a
 
-UnknownScript_0x9d68a: ; 0x9d68a
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x9d68d
 
-UnknownScript_0x9d68d: ; 0x9d68d
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x9d690
 
-TrainerBlackbeltYoshi: ; 0x9d690
+TrainerBlackbeltYoshi:
 	; bit/flag number
 	dw $4a5
 
@@ -99,18 +93,16 @@ TrainerBlackbeltYoshi: ; 0x9d690
 
 	; script when talk again
 	dw BlackbeltYoshiScript
-; 0x9d69c
 
-BlackbeltYoshiScript: ; 0x9d69c
+BlackbeltYoshiScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9d9fa
 	closetext
 	loadmovesprites
 	end
-; 0x9d6a4
 
-TrainerBlackbeltLao: ; 0x9d6a4
+TrainerBlackbeltLao:
 	; bit/flag number
 	dw $4a7
 
@@ -128,18 +120,16 @@ TrainerBlackbeltLao: ; 0x9d6a4
 
 	; script when talk again
 	dw BlackbeltLaoScript
-; 0x9d6b0
 
-BlackbeltLaoScript: ; 0x9d6b0
+BlackbeltLaoScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9da61
 	closetext
 	loadmovesprites
 	end
-; 0x9d6b8
 
-TrainerBlackbeltNob: ; 0x9d6b8
+TrainerBlackbeltNob:
 	; bit/flag number
 	dw $4a8
 
@@ -157,18 +147,16 @@ TrainerBlackbeltNob: ; 0x9d6b8
 
 	; script when talk again
 	dw BlackbeltNobScript
-; 0x9d6c4
 
-BlackbeltNobScript: ; 0x9d6c4
+BlackbeltNobScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9dac0
 	closetext
 	loadmovesprites
 	end
-; 0x9d6cc
 
-TrainerBlackbeltLung: ; 0x9d6cc
+TrainerBlackbeltLung:
 	; bit/flag number
 	dw $4aa
 
@@ -186,16 +174,14 @@ TrainerBlackbeltLung: ; 0x9d6cc
 
 	; script when talk again
 	dw BlackbeltLungScript
-; 0x9d6d8
 
-BlackbeltLungScript: ; 0x9d6d8
+BlackbeltLungScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9db14
 	closetext
 	loadmovesprites
 	end
-; 0x9d6e0
 
 CianwoodGymBoulder:
 	jumpstd strengthboulder
@@ -208,16 +194,15 @@ CianwoodGymStatue:
 	trainertotext CHUCK, 1, $1
 	jumpstd gymstatue2
 
-MovementData_0x9d6f3: ; 0x9d6f3
+MovementData_0x9d6f3:
 	db $39 ; movement
 	big_step_left
 	big_step_up
 	fast_jump_step_right
 	db $38 ; movement
 	step_end
-; 0x9d6f9
 
-UnknownText_0x9d6f9: ; 0x9d6f9
+UnknownText_0x9d6f9:
 	text "WAHAHAH!"
 
 	para "So you've come"
@@ -232,17 +217,15 @@ UnknownText_0x9d6f9: ; 0x9d6f9
 
 	para "Watch this!"
 	done
-; 0x9d76f
 
-UnknownText_0x9d76f: ; 0x9d76f
+UnknownText_0x9d76f:
 	text "CHUCK: Urggh!"
 	line "…"
 
 	para "Oooarrgh!"
 	done
-; 0x9d78a
 
-UnknownText_0x9d78a: ; 0x9d78a
+UnknownText_0x9d78a:
 	text "There! Scared now,"
 	line "are you?"
 
@@ -255,9 +238,8 @@ UnknownText_0x9d78a: ; 0x9d78a
 	para "Come on. We shall"
 	line "do battle!"
 	done
-; 0x9d7f6
 
-UnknownText_0x9d7f6: ; 0x9d7f6
+UnknownText_0x9d7f6:
 	text "Wha? Huh?"
 	line "I lost?"
 
@@ -265,15 +247,13 @@ UnknownText_0x9d7f6: ; 0x9d7f6
 	line "You're worthy of"
 	cont "STORMBADGE!"
 	done
-; 0x9d835
 
-UnknownText_0x9d835: ; 0x9d835
+UnknownText_0x9d835:
 	text "<PLAYER> received"
 	line "STORMBADGE."
 	done
-; 0x9d84d
 
-UnknownText_0x9d84d: ; 0x9d84d
+UnknownText_0x9d84d:
 	text "STORMBADGE makes"
 	line "all #MON up to"
 
@@ -289,9 +269,8 @@ UnknownText_0x9d84d: ; 0x9d84d
 	para "Here, take this"
 	line "too!"
 	done
-; 0x9d8da
 
-UnknownText_0x9d8da: ; 0x9d8da
+UnknownText_0x9d8da:
 	text "That is DYNAMIC-"
 	line "PUNCH."
 
@@ -301,9 +280,8 @@ UnknownText_0x9d8da: ; 0x9d8da
 	para "does, it causes"
 	line "confusion!"
 	done
-; 0x9d930
 
-UnknownText_0x9d930: ; 0x9d930
+UnknownText_0x9d930:
 	text "WAHAHAH! I enjoyed"
 	line "battling you!"
 
@@ -314,9 +292,8 @@ UnknownText_0x9d930: ; 0x9d930
 	line "going to train 24"
 	cont "hours a day!"
 	done
-; 0x9d997
 
-BlackbeltYoshiSeenText: ; 0x9d997
+BlackbeltYoshiSeenText:
 	text "My #MON and I"
 	line "are bound togeth-"
 	cont "er by friendship."
@@ -324,76 +301,64 @@ BlackbeltYoshiSeenText: ; 0x9d997
 	para "Our bond will"
 	line "never be broken!"
 	done
-; 0x9d9e9
 
-BlackbeltYoshiBeatenText: ; 0x9d9e9
+BlackbeltYoshiBeatenText:
 	text "This isn't real!"
 	done
-; 0x9d9fa
 
-UnknownText_0x9d9fa: ; 0x9d9fa
+UnknownText_0x9d9fa:
 	text "You seem to have a"
 	line "strong bond with"
 	cont "your #MON too!"
 	done
-; 0x9da2e
 
-BlackbeltLaoSeenText: ; 0x9da2e
+BlackbeltLaoSeenText:
 	text "We martial artists"
 	line "fear nothing!"
 	done
-; 0x9da50
 
-BlackbeltLaoBeatenText: ; 0x9da50
+BlackbeltLaoBeatenText:
 	text "That's shocking!"
 	done
-; 0x9da61
 
-UnknownText_0x9da61: ; 0x9da61
+UnknownText_0x9da61:
 	text "Fighting #MON"
 	line "are afraid of psy-"
 	cont "chics…"
 	done
-; 0x9da8a
 
-BlackbeltNobSeenText: ; 0x9da8a
+BlackbeltNobSeenText:
 	text "Words are useless."
 	line "Let your fists do"
 	cont "the talking!"
 	done
-; 0x9dabd
 
-BlackbeltNobBeatenText: ; 0x9dabd
+BlackbeltNobBeatenText:
 	text "…"
 	done
-; 0x9dac0
 
-UnknownText_0x9dac0: ; 0x9dac0
+UnknownText_0x9dac0:
 	text "I lost! "
 	line "I'm speechless!"
 	done
-; 0x9dad9
 
-BlackbeltLungSeenText: ; 0x9dad9
+BlackbeltLungSeenText:
 	text "My raging fists"
 	line "will shatter your"
 	cont "#MON!"
 	done
-; 0x9db02
 
-BlackbeltLungBeatenText: ; 0x9db02
+BlackbeltLungBeatenText:
 	text "I got shattered!"
 	done
-; 0x9db14
 
-UnknownText_0x9db14: ; 0x9db14
+UnknownText_0x9db14:
 	text "My #MON lost…"
 	line "My… my pride is"
 	cont "shattered…"
 	done
-; 0x9db3e
 
-CianwoodGym_MapEventHeader: ; 0x9db3e
+CianwoodGym_MapEventHeader:
 	; filler
 	db 0, 0
 
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index ea4a57e76..702f96fcf 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -1,4 +1,4 @@
-EcruteakGym_MapScriptHeader: ; 0x99d49
+EcruteakGym_MapScriptHeader:
 	; trigger count
 	db 2
 
@@ -8,22 +8,19 @@ EcruteakGym_MapScriptHeader: ; 0x99d49
 
 	; callback count
 	db 0
-; 0x99d53
 
-UnknownScript_0x99d53: ; 0x99d53
+UnknownScript_0x99d53:
 	priorityjump UnknownScript_0x99dc6
 	end
-; 0x99d57
 
-UnknownScript_0x99d57: ; 0x99d57
+UnknownScript_0x99d57:
 	end
-; 0x99d58
 
-MortyScript_0x99d58: ; 0x99d58
+MortyScript_0x99d58:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_MORTY
-	iftrue UnknownScript_0x99d8c
+	iftrue .FightDone
 	writetext UnknownText_0x99e65
 	closetext
 	loadmovesprites
@@ -36,13 +33,13 @@ MortyScript_0x99d58: ; 0x99d58
 	writetext UnknownText_0x9a043
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $001e
+	setflag ENGINE_FOGBADGE
 	checkcode VAR_BADGES
-	scall UnknownScript_0x99db7
+	scall EcruteakGymTriggerRockets
 	domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1
 	setevent $0766
 	setevent $0767
-UnknownScript_0x99d8c: ; 0x99d8c	
+.FightDone
 	checkevent EVENT_GOT_TM30_SHADOW_BALL
 	iftrue UnknownScript_0x99db1
 	setevent EVENT_BEAT_SAGE_JEFFREY
@@ -58,31 +55,26 @@ UnknownScript_0x99d8c: ; 0x99d8c
 	closetext
 	loadmovesprites
 	end
-; 0x99db1
 
-UnknownScript_0x99db1: ; 0x99db1
+UnknownScript_0x99db1:
 	writetext UnknownText_0x9a145
 	closetext
-UnknownScript_0x99db5: ; 0x99db5
+UnknownScript_0x99db5:
 	loadmovesprites
 	end
-; 0x99db7
 
-UnknownScript_0x99db7: ; 0x99db7
-	if_equal $7, UnknownScript_0x99dc3
-	if_equal $6, UnknownScript_0x99dc0
+EcruteakGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x99dc0
 
-UnknownScript_0x99dc0: ; 0x99dc0
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x99dc3
 
-UnknownScript_0x99dc3: ; 0x99dc3
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x99dc6
 
-UnknownScript_0x99dc6: ; 0x99dc6
+UnknownScript_0x99dc6:
 	applymovement $0, MovementData_0x99e5d
 	applymovement $8, MovementData_0x99e63
 	loadfont
@@ -97,9 +89,8 @@ UnknownScript_0x99dc6: ; 0x99dc6
 	waitbutton
 	warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b
 	end
-; 0x99de9
 
-TrainerSageJeffrey: ; 0x99de9
+TrainerSageJeffrey:
 	; bit/flag number
 	dw $415
 
@@ -117,18 +108,16 @@ TrainerSageJeffrey: ; 0x99de9
 
 	; script when talk again
 	dw SageJeffreyScript
-; 0x99df5
 
-SageJeffreyScript: ; 0x99df5
+SageJeffreyScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9a263
 	closetext
 	loadmovesprites
 	end
-; 0x99dfd
 
-TrainerSagePing: ; 0x99dfd
+TrainerSagePing:
 	; bit/flag number
 	dw $416
 
@@ -146,18 +135,16 @@ TrainerSagePing: ; 0x99dfd
 
 	; script when talk again
 	dw SagePingScript
-; 0x99e09
 
-SagePingScript: ; 0x99e09
+SagePingScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9a2b7
 	closetext
 	loadmovesprites
 	end
-; 0x99e11
 
-TrainerMediumMartha: ; 0x99e11
+TrainerMediumMartha:
 	; bit/flag number
 	dw $58b
 
@@ -175,18 +162,16 @@ TrainerMediumMartha: ; 0x99e11
 
 	; script when talk again
 	dw MediumMarthaScript
-; 0x99e1d
 
-MediumMarthaScript: ; 0x99e1d
+MediumMarthaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9a318
 	closetext
 	loadmovesprites
 	end
-; 0x99e25
 
-TrainerMediumGrace: ; 0x99e25
+TrainerMediumGrace:
 	; bit/flag number
 	dw $58c
 
@@ -204,18 +189,16 @@ TrainerMediumGrace: ; 0x99e25
 
 	; script when talk again
 	dw MediumGraceScript
-; 0x99e31
 
-MediumGraceScript: ; 0x99e31
+MediumGraceScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x9a38a
 	closetext
 	loadmovesprites
 	end
-; 0x99e39
 
-EcruteakGymGuyScript: ; 0x99e39
+EcruteakGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_MORTY
@@ -230,7 +213,6 @@ EcruteakGymGuyScript: ; 0x99e39
 	closetext
 	loadmovesprites
 	end
-; 0x99e4d
 
 EcruteakGymStatue:
 	checkflag ENGINE_FOGBADGE
@@ -240,24 +222,21 @@ EcruteakGymStatue:
 	trainertotext MORTY, 1, $1
 	jumpstd gymstatue2
 
-MovementData_0x99e5d: ; 0x99e5d
+MovementData_0x99e5d:
 	step_up
 	step_end
-; 0x99e5f
 
-MovementData_0x99e5f: ; 0x99e5f
+MovementData_0x99e5f:
 	fix_facing
 	slow_step_down
 	remove_fixed_facing
 	step_end
-; 0x99e63
 
-MovementData_0x99e63: ; 0x99e63
+MovementData_0x99e63:
 	slow_step_down
 	step_end
-; 0x99e65
 
-UnknownText_0x99e65: ; 0x99e65
+UnknownText_0x99e65:
 	text "Good of you to"
 	line "have come."
 
@@ -297,24 +276,21 @@ UnknownText_0x99e65: ; 0x99e65
 	line "help me reach that"
 	cont "level!"
 	done
-; 0x9a00a
 
-UnknownText_0x9a00a: ; 0x9a00a
+UnknownText_0x9a00a:
 	text "I'm not good"
 	line "enough yet…"
 
 	para "All right. This"
 	line "BADGE is yours."
 	done
-; 0x9a043
 
-UnknownText_0x9a043: ; 0x9a043
+UnknownText_0x9a043:
 	text "<PLAYER> received"
 	line "FOGBADGE."
 	done
-; 0x9a059
 
-UnknownText_0x9a059: ; 0x9a059
+UnknownText_0x9a059:
 	text "By having FOG-"
 	line "BADGE, #MON up"
 
@@ -330,9 +306,8 @@ UnknownText_0x9a059: ; 0x9a059
 	para "I want you to have"
 	line "this too."
 	done
-; 0x9a0ec
 
-UnknownText_0x9a0ec: ; 0x9a0ec
+UnknownText_0x9a0ec:
 	text "It's SHADOW BALL."
 	line "It causes damage"
 
@@ -342,9 +317,8 @@ UnknownText_0x9a0ec: ; 0x9a0ec
 	para "Use it if it"
 	line "appeals to you."
 	done
-; 0x9a145
 
-UnknownText_0x9a145: ; 0x9a145
+UnknownText_0x9a145:
 	text "I see…"
 
 	para "Your journey has"
@@ -358,9 +332,8 @@ UnknownText_0x9a145: ; 0x9a145
 	para "I envy you for"
 	line "that…"
 	done
-; 0x9a1bd
 
-SageJeffreySeenText: ; 0x9a1bd
+SageJeffreySeenText:
 	text "I spent the spring"
 	line "with my #MON."
 
@@ -373,33 +346,28 @@ SageJeffreySeenText: ; 0x9a1bd
 	para "lived together"
 	line "for a long time."
 	done
-; 0x9a23d
 
-SageJeffreyBeatenText: ; 0x9a23d
+SageJeffreyBeatenText:
 	text "Wins and losses, I"
 	line "experienced both."
 	done
-; 0x9a263
 
-UnknownText_0x9a263: ; 0x9a263
+UnknownText_0x9a263:
 	text "Where did #MON"
 	line "come from?"
 	done
-; 0x9a27e
 
-SagePingSeenText: ; 0x9a27e
+SagePingSeenText:
 	text "Can you inflict"
 	line "any damage on our"
 	cont "#MON?"
 	done
-; 0x9a2a7
 
-SagePingBeatenText: ; 0x9a2a7
+SagePingBeatenText:
 	text "Ah! Well done!"
 	done
-; 0x9a2b7
 
-UnknownText_0x9a2b7: ; 0x9a2b7
+UnknownText_0x9a2b7:
 	text "We use only ghost-"
 	line "type #MON."
 
@@ -407,39 +375,33 @@ UnknownText_0x9a2b7: ; 0x9a2b7
 	line "attack can harm"
 	cont "them!"
 	done
-; 0x9a2fb
 
-MediumMarthaSeenText: ; 0x9a2fb
+MediumMarthaSeenText:
 	text "I shall win!"
 	done
-; 0x9a309
 
-MediumMarthaBeatenText: ; 0x9a309
+MediumMarthaBeatenText:
 	text "I, I, I lost!"
 	done
-; 0x9a318
 
-UnknownText_0x9a318: ; 0x9a318
+UnknownText_0x9a318:
 	text "The one who wants"
 	line "to win most--will!"
 	done
-; 0x9a33e
 
-MediumGraceSeenText: ; 0x9a33e
+MediumGraceSeenText:
 	text "Stumped by our in-"
 	line "visible floor?"
 
 	para "Defeat me if you"
 	line "want a hint!"
 	done
-; 0x9a37f
 
-MediumGraceBeatenText: ; 0x9a37f
+MediumGraceBeatenText:
 	text "Wha-what?"
 	done
-; 0x9a38a
 
-UnknownText_0x9a38a: ; 0x9a38a
+UnknownText_0x9a38a:
 	text "Fine. I shall tell"
 	line "you the secret of"
 
@@ -449,9 +411,8 @@ UnknownText_0x9a38a: ; 0x9a38a
 	para "The path is right"
 	line "before our eyes!"
 	done
-; 0x9a3e8
 
-EcruteakGymGuyText: ; 0x9a3e8
+EcruteakGymGuyText:
 	text "The trainers here"
 	line "have secret mo-"
 	cont "tives."
@@ -462,9 +423,8 @@ EcruteakGymGuyText: ; 0x9a3e8
 	para "deep secrets about"
 	line "ECRUTEAK."
 	done
-; 0x9a452
 
-EcruteakGymGuyWinText: ; 0x9a452
+EcruteakGymGuyWinText:
 	text "Whew, <PLAYER>."
 	line "You did great!"
 
@@ -472,9 +432,8 @@ EcruteakGymGuyWinText: ; 0x9a452
 	line "the corner out of"
 	cont "pure terror!"
 	done
-; 0x9a49c
 
-UnknownText_0x9a49c: ; 0x9a49c
+UnknownText_0x9a49c:
 	text "MORTY, the GYM"
 	line "LEADER, is absent."
 
@@ -483,9 +442,8 @@ UnknownText_0x9a49c: ; 0x9a49c
 
 	para "Hohohoho."
 	done
-; 0x9a4e9
 
-EcruteakGym_MapEventHeader: ; 0x9a4e9
+EcruteakGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -542,4 +500,3 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9
 	person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, $ffff
 	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff
 	person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8
-; 0x9a5f9
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 555cba6ee..e33dcc54d 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,14 +1,13 @@
-FuchsiaGym_MapScriptHeader: ; 0x195db7
+FuchsiaGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x195db9
 
-JanineScript_0x195db9: ; 0x195db9
-	checkflag $0027
-	iftrue UnknownScript_0x195e00
+JanineScript_0x195db9:
+	checkflag ENGINE_SOULBADGE
+	iftrue .FightDone
 	applymovement $2, MovementData_0x195f27
 	faceplayer
 	loadfont
@@ -20,10 +19,10 @@ JanineScript_0x195db9: ; 0x195db9
 	startbattle
 	returnafterbattle
 	setevent EVENT_BEAT_JANINE
-	setevent $0517
-	setevent $051a
-	setevent $0482
-	setevent $041e
+	setevent EVENT_BEAT_LASS_ALICE
+	setevent EVENT_BEAT_LASS_LINDA
+	setevent EVENT_BEAT_PICNICKER_CINDY
+	setevent EVENT_BEAT_CAMPER_BARRY
 	variablesprite $7, $28
 	variablesprite $8, $28
 	variablesprite $9, $28
@@ -33,14 +32,12 @@ JanineScript_0x195db9: ; 0x195db9
 	writetext UnknownText_0x195feb
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0027
+	setflag ENGINE_SOULBADGE
 	jump UnknownScript_0x195e02
-; 0x195e00
-
-UnknownScript_0x195e00: ; 0x195e00
+.FightDone
 	faceplayer
 	loadfont
-UnknownScript_0x195e02: ; 0x195e02
+UnknownScript_0x195e02:
 	checkevent EVENT_GOT_TM06_TOXIC
 	iftrue UnknownScript_0x195e15
 	writetext UnknownText_0x196002
@@ -48,24 +45,23 @@ UnknownScript_0x195e02: ; 0x195e02
 	verbosegiveitem TM_TOXIC, 1
 	iffalse UnknownScript_0x195e15
 	setevent EVENT_GOT_TM06_TOXIC
-UnknownScript_0x195e15: ; 0x195e15
+UnknownScript_0x195e15:
 	writetext UnknownText_0x196074
 	closetext
 	loadmovesprites
 	end
-; 0x195e1b
 
-FuschiaGym1Script_0x195e1b: ; 0x195e1b
-	checkevent $0517
+FuschiaGym1Script_0x195e1b:
+	checkevent EVENT_BEAT_LASS_ALICE
 	iftrue UnknownScript_0x195e2c
 	applymovement $3, MovementData_0x195f27
 	faceplayer
 	variablesprite $7, $28
 	special Function14209
-UnknownScript_0x195e2c: ; 0x195e2c
+UnknownScript_0x195e2c:
 	faceplayer
 	loadfont
-	checkevent $0517
+	checkevent EVENT_BEAT_LASS_ALICE
 	iftrue UnknownScript_0x195e4f
 	writetext UnknownText_0x1960e6
 	closetext
@@ -75,34 +71,31 @@ UnknownScript_0x195e2c: ; 0x195e2c
 	startbattle
 	iftrue UnknownScript_0x195e4a
 	returnafterbattle
-	setevent $0517
+	setevent EVENT_BEAT_LASS_ALICE
 	end
-; 0x195e4a
 
-UnknownScript_0x195e4a: ; 0x195e4a
+UnknownScript_0x195e4a:
 	variablesprite $7, $a
 	returnafterbattle
 	end
-; 0x195e4f
 
-UnknownScript_0x195e4f: ; 0x195e4f
+UnknownScript_0x195e4f:
 	writetext UnknownText_0x196139
 	closetext
 	loadmovesprites
 	end
-; 0x195e55
 
-FuschiaGym2Script_0x195e55: ; 0x195e55
-	checkevent $051a
+FuschiaGym2Script_0x195e55:
+	checkevent EVENT_BEAT_LASS_LINDA
 	iftrue UnknownScript_0x195e66
 	applymovement $4, MovementData_0x195f27
 	faceplayer
 	variablesprite $8, $28
 	special Function14209
-UnknownScript_0x195e66: ; 0x195e66
+UnknownScript_0x195e66:
 	faceplayer
 	loadfont
-	checkevent $051a
+	checkevent EVENT_BEAT_LASS_LINDA
 	iftrue UnknownScript_0x195e89
 	writetext UnknownText_0x196166
 	closetext
@@ -112,34 +105,31 @@ UnknownScript_0x195e66: ; 0x195e66
 	startbattle
 	iftrue UnknownScript_0x195e84
 	returnafterbattle
-	setevent $051a
+	setevent EVENT_BEAT_LASS_LINDA
 	end
-; 0x195e84
 
-UnknownScript_0x195e84: ; 0x195e84
+UnknownScript_0x195e84:
 	variablesprite $8, $a
 	returnafterbattle
 	end
-; 0x195e89
 
-UnknownScript_0x195e89: ; 0x195e89
+UnknownScript_0x195e89:
 	writetext UnknownText_0x196199
 	closetext
 	loadmovesprites
 	end
-; 0x195e8f
 
-FuschiaGym3Script_0x195e8f: ; 0x195e8f
-	checkevent $0482
+FuschiaGym3Script_0x195e8f:
+	checkevent EVENT_BEAT_PICNICKER_CINDY
 	iftrue UnknownScript_0x195ea0
 	applymovement $5, MovementData_0x195f27
 	faceplayer
 	variablesprite $9, $28
 	special Function14209
-UnknownScript_0x195ea0: ; 0x195ea0
+UnknownScript_0x195ea0:
 	faceplayer
 	loadfont
-	checkevent $0482
+	checkevent EVENT_BEAT_PICNICKER_CINDY
 	iftrue UnknownScript_0x195ec3
 	writetext UnknownText_0x1961bb
 	closetext
@@ -149,34 +139,31 @@ UnknownScript_0x195ea0: ; 0x195ea0
 	startbattle
 	iftrue UnknownScript_0x195ebe
 	returnafterbattle
-	setevent $0482
+	setevent EVENT_BEAT_PICNICKER_CINDY
 	end
-; 0x195ebe
 
-UnknownScript_0x195ebe: ; 0x195ebe
+UnknownScript_0x195ebe:
 	variablesprite $9, $a
 	returnafterbattle
 	end
-; 0x195ec3
 
-UnknownScript_0x195ec3: ; 0x195ec3
+UnknownScript_0x195ec3:
 	writetext UnknownText_0x19620c
 	closetext
 	loadmovesprites
 	end
-; 0x195ec9
 
-FuschiaGym4Script_0x195ec9: ; 0x195ec9
-	checkevent $041e
+FuschiaGym4Script_0x195ec9:
+	checkevent EVENT_BEAT_CAMPER_BARRY
 	iftrue UnknownScript_0x195eda
 	applymovement $6, MovementData_0x195f27
 	faceplayer
 	variablesprite $a, $27
 	special Function14209
-UnknownScript_0x195eda: ; 0x195eda
+UnknownScript_0x195eda:
 	faceplayer
 	loadfont
-	checkevent $041e
+	checkevent EVENT_BEAT_CAMPER_BARRY
 	iftrue UnknownScript_0x195efd
 	writetext UnknownText_0x196228
 	closetext
@@ -186,24 +173,21 @@ UnknownScript_0x195eda: ; 0x195eda
 	startbattle
 	iftrue UnknownScript_0x195ef8
 	returnafterbattle
-	setevent $041e
+	setevent EVENT_BEAT_CAMPER_BARRY
 	end
-; 0x195ef8
 
-UnknownScript_0x195ef8: ; 0x195ef8
+UnknownScript_0x195ef8:
 	variablesprite $a, $a
 	returnafterbattle
 	end
-; 0x195efd
 
-UnknownScript_0x195efd: ; 0x195efd
+UnknownScript_0x195efd:
 	writetext UnknownText_0x19626b
 	closetext
 	loadmovesprites
 	end
-; 0x195f03
 
-FuchsiaGymGuyScript: ; 0x195f03
+FuchsiaGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_JANINE
@@ -218,7 +202,6 @@ FuchsiaGymGuyScript: ; 0x195f03
 	closetext
 	loadmovesprites
 	end
-; 0x195f17
 
 FuchsiaGymStatue:
 	checkflag ENGINE_SOULBADGE
@@ -228,7 +211,7 @@ FuchsiaGymStatue:
 	trainertotext JANINE, 1, $1
 	jumpstd gymstatue2
 
-MovementData_0x195f27: ; 0x195f27
+MovementData_0x195f27:
 	turn_head_down
 	turn_head_left
 	turn_head_up
@@ -243,9 +226,8 @@ MovementData_0x195f27: ; 0x195f27
 	turn_head_right
 	turn_head_down
 	step_end
-; 0x195f35
 
-UnknownText_0x195f35: ; 0x195f35
+UnknownText_0x195f35:
 	text "Fufufufu…"
 
 	para "I'm sorry to dis-"
@@ -258,9 +240,8 @@ UnknownText_0x195f35: ; 0x195f35
 	para "JANINE of FUCHSIA"
 	line "GYM, that's me!"
 	done
-; 0x195fa1
 
-UnknownText_0x195fa1: ; 0x195fa1
+UnknownText_0x195fa1:
 	text "JANINE: You're a"
 	line "tough one. You"
 	cont "definitely won…"
@@ -268,15 +249,13 @@ UnknownText_0x195fa1: ; 0x195fa1
 	para "Here's SOULBADGE."
 	line "Take it."
 	done
-; 0x195feb
 
-UnknownText_0x195feb: ; 0x195feb
+UnknownText_0x195feb:
 	text "<PLAYER> received"
 	line "SOULBADGE."
 	done
-; 0x196002
 
-UnknownText_0x196002: ; 0x196002
+UnknownText_0x196002:
 	text "JANINE: You're so"
 	line "tough! I have a"
 	cont "special gift!"
@@ -287,9 +266,8 @@ UnknownText_0x196002: ; 0x196002
 	para "steadily saps the"
 	line "victim's HP."
 	done
-; 0x196074
 
-UnknownText_0x196074: ; 0x196074
+UnknownText_0x196074:
 	text "JANINE: I'm going"
 	line "to really apply"
 
@@ -300,9 +278,8 @@ UnknownText_0x196074: ; 0x196074
 	line "better than both"
 	cont "Father and you!"
 	done
-; 0x1960e6
 
-UnknownText_0x1960e6: ; 0x1960e6
+UnknownText_0x1960e6:
 	text "Fufufu!"
 
 	para "I'm JANINE, the"
@@ -311,39 +288,33 @@ UnknownText_0x1960e6: ; 0x1960e6
 	para "No, I'm not!"
 	line "Gotcha, sucker!"
 	done
-; 0x196126
 
-UnknownText_0x196126: ; 0x196126
+UnknownText_0x196126:
 	text "I had you fooled…"
 	done
-; 0x196139
 
-UnknownText_0x196139: ; 0x196139
+UnknownText_0x196139:
 	text "How will you dis-"
 	line "tinguish our real"
 	cont "LEADER?"
 	done
-; 0x196166
 
-UnknownText_0x196166: ; 0x196166
+UnknownText_0x196166:
 	text "Fooled you!"
 	line "Hahaha!"
 	done
-; 0x19617b
 
-UnknownText_0x19617b: ; 0x19617b
+UnknownText_0x19617b:
 	text "Ooh… I lost…"
 	line "You're not weak…"
 	done
-; 0x196199
 
-UnknownText_0x196199: ; 0x196199
+UnknownText_0x196199:
 	text "Well? Wasn't my"
 	line "disguise perfect?"
 	done
-; 0x1961bb
 
-UnknownText_0x1961bb: ; 0x1961bb
+UnknownText_0x1961bb:
 	text "I'm JANINE!"
 
 	para "How did you know I"
@@ -351,42 +322,36 @@ UnknownText_0x1961bb: ; 0x1961bb
 
 	para "Let's battle!"
 	done
-; 0x1961f1
 
-UnknownText_0x1961f1: ; 0x1961f1
+UnknownText_0x1961f1:
 	text "Darn it!"
 	line "I wanted to win!"
 	done
-; 0x19620c
 
-UnknownText_0x19620c: ; 0x19620c
+UnknownText_0x19620c:
 	text "You must be"
 	line "getting tired."
 	done
-; 0x196228
 
-UnknownText_0x196228: ; 0x196228
+UnknownText_0x196228:
 	text "Wahahaha!"
 
 	para "You betcha!"
 	line "I'm JANINE!"
 	done
-; 0x19624a
 
-UnknownText_0x19624a: ; 0x19624a
+UnknownText_0x19624a:
 	text "My disguise was"
 	line "right on! Dang!"
 	done
-; 0x19626b
 
-UnknownText_0x19626b: ; 0x19626b
+UnknownText_0x19626b:
 	text "Hey, you. Was my"
 	line "disguise cute or"
 	cont "what, huh?"
 	done
-; 0x196299
 
-FuchsiaGymGuyText: ; 0x196299
+FuchsiaGymGuyText:
 	text "Yo, CHAMP in"
 	line "making!"
 
@@ -400,16 +365,14 @@ FuchsiaGymGuyText: ; 0x196299
 	para "Which of them is"
 	line "the real JANINE?"
 	done
-; 0x196325
 
-FuchsiaGymGuyWinText: ; 0x196325
+FuchsiaGymGuyWinText:
 	text "That was a great"
 	line "battle, trainer"
 	cont "from JOHTO!"
 	done
-; 0x196353
 
-FuchsiaGym_MapEventHeader: ; 0x196353
+FuchsiaGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -434,4 +397,3 @@ FuchsiaGym_MapEventHeader: ; 0x196353
 	person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, $ffff
 	person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, $ffff
 	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff
-; 0x1963bb
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 98a1632b3..021dfedda 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -1,4 +1,4 @@
-GoldenrodGym_MapScriptHeader: ; 0x54000
+GoldenrodGym_MapScriptHeader:
 	; trigger count
 	db 2
 
@@ -8,20 +8,17 @@ GoldenrodGym_MapScriptHeader: ; 0x54000
 
 	; callback count
 	db 0
-; 0x5400a
 
-UnknownScript_0x5400a: ; 0x5400a
+UnknownScript_0x5400a:
 	end
-; 0x5400b
 
-UnknownScript_0x5400b: ; 0x5400b
+UnknownScript_0x5400b:
 	end
-; 0x5400c
 
-WhitneyScript_0x5400c: ; 0x5400c
+WhitneyScript_0x5400c:
 	faceplayer
 	checkevent EVENT_BEAT_WHITNEY
-	iftrue UnknownScript_0x54037
+	iftrue .FightDone
 	loadfont
 	writetext UnknownText_0x54122
 	closetext
@@ -37,20 +34,19 @@ WhitneyScript_0x5400c: ; 0x5400c
 	setevent EVENT_BEAT_BEAUTY_SAMANTHA
 	setevent EVENT_BEAT_LASS_CARRIE
 	setevent EVENT_BEAT_LASS_BRIDGET
-UnknownScript_0x54037: ; 0x54037
+.FightDone
 	loadfont
 	checkevent EVENT_MADE_WHITNEY_CRY
-	iffalse UnknownScript_0x54044
+	iffalse .StoppedCrying
 	writetext UnknownText_0x541f4
 	closetext
 	loadmovesprites
 	end
-; 0x54044
 
-UnknownScript_0x54044: ; 0x54044
+.StoppedCrying
 	checkevent EVENT_GOT_TM45_ATTRACT
 	iftrue UnknownScript_0x54077
-	checkflag $001d
+	checkflag ENGINE_PLAINBADGE
 	iftrue UnknownScript_0x54064
 	writetext UnknownText_0x54222
 	keeptextopen
@@ -58,10 +54,10 @@ UnknownScript_0x54044: ; 0x54044
 	writetext UnknownText_0x54273
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $001d
-	checkcode $7
-	scall UnknownScript_0x5407d
-UnknownScript_0x54064: ; 0x54064
+	setflag ENGINE_PLAINBADGE
+	checkcode VAR_BADGES
+	scall GoldenrodGymTriggerRockets
+UnknownScript_0x54064:
 	writetext UnknownText_0x5428b
 	keeptextopen
 	verbosegiveitem TM_ATTRACT, 1
@@ -71,31 +67,26 @@ UnknownScript_0x54064: ; 0x54064
 	closetext
 	loadmovesprites
 	end
-; 0x54077
 
-UnknownScript_0x54077: ; 0x54077
+UnknownScript_0x54077:
 	writetext UnknownText_0x54360
 	closetext
-UnknownScript_0x5407b: ; 0x5407b
+UnknownScript_0x5407b:
 	loadmovesprites
 	end
-; 0x5407d
 
-UnknownScript_0x5407d: ; 0x5407d
-	if_equal $7, UnknownScript_0x54089
-	if_equal $6, UnknownScript_0x54086
+GoldenrodGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x54086
 
-UnknownScript_0x54086: ; 0x54086
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x54089
 
-UnknownScript_0x54089: ; 0x54089
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x5408c
 
-TrainerLassCarrie: ; 0x5408c
+TrainerLassCarrie:
 	; bit/flag number
 	dw $515
 
@@ -113,18 +104,16 @@ TrainerLassCarrie: ; 0x5408c
 
 	; script when talk again
 	dw LassCarrieScript
-; 0x54098
 
-LassCarrieScript: ; 0x54098
+LassCarrieScript:
 	talkaftercancel
 	loadfont
 	writetext LassCarrieOWText
 	closetext
 	loadmovesprites
 	end
-; 0x540a0
 
-WhitneyCriesScript: ; 0x540a0
+WhitneyCriesScript:
 	showemote $0, $4, 15
 	applymovement $4, BridgetWalksUpMovement
 	spriteface $0, DOWN
@@ -136,9 +125,8 @@ WhitneyCriesScript: ; 0x540a0
 	dotrigger $0
 	clearevent EVENT_MADE_WHITNEY_CRY
 	end
-; 0x540bb
 
-TrainerLassBridget: ; 0x540bb
+TrainerLassBridget:
 	; bit/flag number
 	dw $516
 
@@ -156,18 +144,16 @@ TrainerLassBridget: ; 0x540bb
 
 	; script when talk again
 	dw LassBridgetScript
-; 0x540c7
 
-LassBridgetScript: ; 0x540c7
+LassBridgetScript:
 	talkaftercancel
 	loadfont
 	writetext LassBridgetOWText
 	closetext
 	loadmovesprites
 	end
-; 0x540cf
 
-TrainerBeautyVictoria: ; 0x540cf
+TrainerBeautyVictoria:
 	; bit/flag number
 	dw $4ad
 
@@ -185,18 +171,16 @@ TrainerBeautyVictoria: ; 0x540cf
 
 	; script when talk again
 	dw BeautyVictoriaScript
-; 0x540db
 
-BeautyVictoriaScript: ; 0x540db
+BeautyVictoriaScript:
 	talkaftercancel
 	loadfont
 	writetext BeautyVictoriaOWText
 	closetext
 	loadmovesprites
 	end
-; 0x540e3
 
-TrainerBeautySamantha: ; 0x540e3
+TrainerBeautySamantha:
 	; bit/flag number
 	dw $4ae
 
@@ -214,18 +198,16 @@ TrainerBeautySamantha: ; 0x540e3
 
 	; script when talk again
 	dw BeautySamanthaScript
-; 0x540ef
 
-BeautySamanthaScript: ; 0x540ef
+BeautySamanthaScript:
 	talkaftercancel
 	loadfont
 	writetext BeautySamanthaOWText
 	closetext
 	loadmovesprites
 	end
-; 0x540f7
 
-GoldenrodGymGuyScript: ; 0x540f7
+GoldenrodGymGuyScript:
 	faceplayer
 	checkevent EVENT_BEAT_WHITNEY
 	iftrue .GoldenrodGymGuyWinScript
@@ -241,7 +223,6 @@ GoldenrodGymGuyScript: ; 0x540f7
 	closetext
 	loadmovesprites
 	end
-; 0x5410c
 
 GoldenrodGymStatue:
 	checkflag ENGINE_PLAINBADGE
@@ -251,19 +232,17 @@ GoldenrodGymStatue:
 	trainertotext WHITNEY, 1, $1
 	jumpstd gymstatue2
 
-BridgetWalksUpMovement: ; 0x5411c
+BridgetWalksUpMovement:
 	step_left
 	turn_head_up
 	step_end
-; 0x5411f
 
-BridgetWalksAwayMovement: ; 0x5411f
+BridgetWalksAwayMovement:
 	step_right
 	turn_head_left
 	step_end
-; 0x54122
 
-UnknownText_0x54122: ; 0x54122
+UnknownText_0x54122:
 	text "Hi! I'm WHITNEY!"
 
 	para "Everyone was into"
@@ -277,9 +256,8 @@ UnknownText_0x54122: ; 0x54122
 	line "tle? I'm warning"
 	cont "you--I'm good!"
 	done
-; 0x541a5
 
-UnknownText_0x541a5: ; 0x541a5
+UnknownText_0x541a5:
 	text "Sob…"
 
 	para "…Waaaaaaah!"
@@ -289,9 +267,8 @@ UnknownText_0x541a5: ; 0x541a5
 	line "so serious! You…"
 	cont "you child, you!"
 	done
-; 0x541f4
 
-UnknownText_0x541f4: ; 0x541f4
+UnknownText_0x541f4:
 	text "Waaaaah!"
 
 	para "Waaaaah!"
@@ -299,9 +276,8 @@ UnknownText_0x541f4: ; 0x541f4
 	para "…Snivel, hic…"
 	line "…You meanie!"
 	done
-; 0x54222
 
-UnknownText_0x54222: ; 0x54222
+UnknownText_0x54222:
 	text "…Sniff…"
 
 	para "What? What do you"
@@ -311,15 +287,13 @@ UnknownText_0x54222: ; 0x54222
 	line "I forgot. Here's"
 	cont "PLAINBADGE."
 	done
-; 0x54273
 
-UnknownText_0x54273: ; 0x54273
+UnknownText_0x54273:
 	text "<PLAYER> received"
 	line "PLAINBADGE."
 	done
-; 0x5428b
 
-UnknownText_0x5428b: ; 0x5428b
+UnknownText_0x5428b:
 	text "PLAINBADGE lets"
 	line "your #MON use"
 
@@ -333,9 +307,8 @@ UnknownText_0x5428b: ; 0x5428b
 	para "Oh, you can have"
 	line "this too!"
 	done
-; 0x54302
 
-UnknownText_0x54302: ; 0x54302
+UnknownText_0x54302:
 	text "It's ATTRACT!"
 	line "It makes full use"
 
@@ -346,39 +319,34 @@ UnknownText_0x54302: ; 0x54302
 	line "fect for a cutie"
 	cont "like me?"
 	done
-; 0x54360
 
-UnknownText_0x54360: ; 0x54360
+UnknownText_0x54360:
 	text "Ah, that was a"
 	line "good cry!"
 
 	para "Come for a visit"
 	line "again! Bye-bye!"
 	done
-; 0x5439b
 
-LassCarrieSeenText: ; 0x5439b
+LassCarrieSeenText:
 	text "Don't let my"
 	line "#MON's cute"
 
 	para "looks fool you."
 	line "They can whip you!"
 	done
-; 0x543d6
 
-LassCarrieBeatenText: ; 0x543d6
+LassCarrieBeatenText:
 	text "Darn… I thought"
 	line "you were weak…"
 	done
-; 0x543f6
 
-LassCarrieOWText: ; 0x543f6
+LassCarrieOWText:
 	text "Do my #MON"
 	line "think I'm cute?"
 	done
-; 0x54411
 
-LassBridgetSeenText: ; 0x54411
+LassBridgetSeenText:
 	text "I like cute #-"
 	line "MON better than"
 	cont "strong #MON."
@@ -386,14 +354,12 @@ LassBridgetSeenText: ; 0x54411
 	para "But I have strong"
 	line "and cute #MON!"
 	done
-; 0x5445f
 
-LassBridgetBeatenText: ; 0x5445f
+LassBridgetBeatenText:
 	text "Oh, no, no, no!"
 	done
-; 0x54470
 
-LassBridgetOWText: ; 0x54470
+LassBridgetOWText:
 	text "I'm trying to beat"
 	line "WHITNEY, but…"
 	cont "It's depressing."
@@ -404,9 +370,8 @@ LassBridgetOWText: ; 0x54470
 	para "try harder next"
 	line "time!"
 	done
-; 0x544d4
 
-BridgetWhitneyCriesText: ; 0x544d4
+BridgetWhitneyCriesText:
 	text "Oh, no. You made"
 	line "WHITNEY cry."
 
@@ -416,51 +381,44 @@ BridgetWhitneyCriesText: ; 0x544d4
 	para "always cries when"
 	line "she loses."
 	done
-; 0x5452d
 
-BeautyVictoriaSeenText: ; 0x5452d
+BeautyVictoriaSeenText:
 	text "Oh, you are a cute"
 	line "little trainer! "
 
 	para "I like you, but I"
 	line "won't hold back!"
 	done
-; 0x54574
 
-BeautyVictoriaBeatenText: ; 0x54574
+BeautyVictoriaBeatenText:
 	text "Let's see… Oops,"
 	line "it's over?"
 	done
-; 0x5458f
 
-BeautyVictoriaOWText: ; 0x5458f
+BeautyVictoriaOWText:
 	text "Wow, you must be"
 	line "good to beat me!"
 	cont "Keep it up!"
 	done
-; 0x545be
 
-BeautySamanthaSeenText: ; 0x545be
+BeautySamanthaSeenText:
 	text "Give it your best"
 	line "shot, or I'll take"
 	cont "you down!"
 	done
-; 0x545ed
 
-BeautySamanthaBeatenText: ; 0x545ed
+BeautySamanthaBeatenText:
 	text "No! Oh, MEOWTH,"
 	line "I'm so sorry!"
 	done
-; 0x5460b
 
-BeautySamanthaOWText: ; 0x5460b
+BeautySamanthaOWText:
 	text "I taught MEOWTH"
 	line "moves for taking"
 	cont "on any type…"
 	done
-; 0x5463a
 
-GoldenrodGymGuyText: ; 0x5463a
+GoldenrodGymGuyText:
 	text "Yo! CHAMP in"
 	line "making!"
 
@@ -472,16 +430,14 @@ GoldenrodGymGuyText: ; 0x5463a
 	line "use fighting-type"
 	cont "#MON."
 	done
-; 0x546a7
 
-GoldenrodGymGuyWinText: ; 0x546a7
+GoldenrodGymGuyWinText:
 	text "You won? Great! I"
 	line "was busy admiring"
 	cont "the ladies here."
 	done
-; 0x546dd
 
-GoldenrodGym_MapEventHeader: ; 0x546dd
+GoldenrodGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -507,4 +463,3 @@ GoldenrodGym_MapEventHeader: ; 0x546dd
 	person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, $ffff
 	person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff
 	person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff
-; 0x5474d
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index d7deacae1..1964201ea 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,16 +1,15 @@
-MahoganyGym_MapScriptHeader: ; 0x199a9c
+MahoganyGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x199a9e
 
-PryceScript_0x199a9e: ; 0x199a9e
+PryceScript_0x199a9e:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_PRYCE
-	iftrue UnknownScript_0x199ac8
+	iftrue .FightDone
 	writetext UnknownText_0x199b8d
 	closetext
 	loadmovesprites
@@ -23,10 +22,10 @@ PryceScript_0x199a9e: ; 0x199a9e
 	writetext UnknownText_0x199d3b
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0021
+	setflag ENGINE_GLACIERBADGE
 	checkcode VAR_BADGES
-	scall UnknownScript_0x199af6
-UnknownScript_0x199ac8: ; 0x199ac8
+	scall MahoganyGymTriggerRockets
+.FightDone
 	checkevent EVENT_GOT_TM16_ICY_WIND
 	iftrue UnknownScript_0x199af0
 	setevent EVENT_BEAT_SKIER_ROXANNE
@@ -43,31 +42,26 @@ UnknownScript_0x199ac8: ; 0x199ac8
 	closetext
 	loadmovesprites
 	end
-; 0x199af0
 
-UnknownScript_0x199af0: ; 0x199af0
+UnknownScript_0x199af0:
 	writetext UnknownText_0x199e59
 	closetext
-UnknownScript_0x199af4: ; 0x199af4
+UnknownScript_0x199af4:
 	loadmovesprites
 	end
-; 0x199af6
 
-UnknownScript_0x199af6: ; 0x199af6
-	if_equal $7, UnknownScript_0x199b02
-	if_equal $6, UnknownScript_0x199aff
+MahoganyGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x199aff
 
-UnknownScript_0x199aff: ; 0x199aff
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x199b02
 
-UnknownScript_0x199b02: ; 0x199b02
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x199b05
 
-TrainerSkierRoxanne: ; 0x199b05
+TrainerSkierRoxanne:
 	; bit/flag number
 	dw $592
 
@@ -85,18 +79,16 @@ TrainerSkierRoxanne: ; 0x199b05
 
 	; script when talk again
 	dw SkierRoxanneScript
-; 0x199b11
 
-SkierRoxanneScript: ; 0x199b11
+SkierRoxanneScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x19a116
 	closetext
 	loadmovesprites
 	end
-; 0x199b19
 
-TrainerSkierClarissa: ; 0x199b19
+TrainerSkierClarissa:
 	; bit/flag number
 	dw $593
 
@@ -114,18 +106,16 @@ TrainerSkierClarissa: ; 0x199b19
 
 	; script when talk again
 	dw SkierClarissaScript
-; 0x199b25
 
-SkierClarissaScript: ; 0x199b25
+SkierClarissaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x19a18f
 	closetext
 	loadmovesprites
 	end
-; 0x199b2d
 
-TrainerBoarderRonald: ; 0x199b2d
+TrainerBoarderRonald:
 	; bit/flag number
 	dw $40e
 
@@ -143,18 +133,16 @@ TrainerBoarderRonald: ; 0x199b2d
 
 	; script when talk again
 	dw BoarderRonaldScript
-; 0x199b39
 
-BoarderRonaldScript: ; 0x199b39
+BoarderRonaldScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x199f2d
 	closetext
 	loadmovesprites
 	end
-; 0x199b41
 
-TrainerBoarderBrad: ; 0x199b41
+TrainerBoarderBrad:
 	; bit/flag number
 	dw $40f
 
@@ -172,18 +160,16 @@ TrainerBoarderBrad: ; 0x199b41
 
 	; script when talk again
 	dw BoarderBradScript
-; 0x199b4d
 
-BoarderBradScript: ; 0x199b4d
+BoarderBradScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x199fdd
 	closetext
 	loadmovesprites
 	end
-; 0x199b55
 
-TrainerBoarderDouglas: ; 0x199b55
+TrainerBoarderDouglas:
 	; bit/flag number
 	dw $410
 
@@ -201,18 +187,16 @@ TrainerBoarderDouglas: ; 0x199b55
 
 	; script when talk again
 	dw BoarderDouglasScript
-; 0x199b61
 
-BoarderDouglasScript: ; 0x199b61
+BoarderDouglasScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x19a047
 	closetext
 	loadmovesprites
 	end
-; 0x199b69
 
-MahoganyGymGuyScript: ; 0x199b69
+MahoganyGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_PRYCE
@@ -227,7 +211,6 @@ MahoganyGymGuyScript: ; 0x199b69
 	closetext
 	loadmovesprites
 	end
-; 0x199b7d
 
 MahoganyGymStatue:
 	checkflag ENGINE_GLACIERBADGE
@@ -237,7 +220,7 @@ MahoganyGymStatue:
 	trainertotext PRYCE, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x199b8d: ; 0x199b8d
+UnknownText_0x199b8d:
 	text "#MON have many"
 	line "experiences in"
 
@@ -267,9 +250,8 @@ UnknownText_0x199b8d: ; 0x199b8d
 	para "shall demonstrate"
 	line "my power!"
 	done
-; 0x199cb3
 
-UnknownText_0x199cb3: ; 0x199cb3
+UnknownText_0x199cb3:
 	text "Ah, I am impressed"
 	line "by your prowess."
 
@@ -282,15 +264,13 @@ UnknownText_0x199cb3: ; 0x199cb3
 	para "You are worthy of"
 	line "this BADGE!"
 	done
-; 0x199d3b
 
-UnknownText_0x199d3b: ; 0x199d3b
+UnknownText_0x199d3b:
 	text "<PLAYER> received"
 	line "GLACIERBADGE."
 	done
-; 0x199d55
 
-UnknownText_0x199d55: ; 0x199d55
+UnknownText_0x199d55:
 	text "That BADGE will"
 	line "raise the SPECIAL"
 	cont "stats of #MON."
@@ -303,9 +283,8 @@ UnknownText_0x199d55: ; 0x199d55
 	para "And this… This is"
 	line "a gift from me!"
 	done
-; 0x199def
 
-UnknownText_0x199def: ; 0x199def
+UnknownText_0x199def:
 	text "That TM contains"
 	line "ICY WIND."
 
@@ -316,9 +295,8 @@ UnknownText_0x199def: ; 0x199def
 	line "the harshness of"
 	cont "winter."
 	done
-; 0x199e59
 
-UnknownText_0x199e59: ; 0x199e59
+UnknownText_0x199e59:
 	text "When the ice and"
 	line "snow melt, spring"
 	cont "arrives."
@@ -332,31 +310,27 @@ UnknownText_0x199e59: ; 0x199e59
 	para "Cherish your time"
 	line "together!"
 	done
-; 0x199ee1
 
-BoarderRonaldSeenText: ; 0x199ee1
+BoarderRonaldSeenText:
 	text "I'll freeze your"
 	line "#MON, so you"
 	cont "can't do a thing!"
 	done
-; 0x199f10
 
-BoarderRonaldBeatenText: ; 0x199f10
+BoarderRonaldBeatenText:
 	text "Darn. I couldn't"
 	line "do a thing."
 	done
-; 0x199f2d
 
-UnknownText_0x199f2d: ; 0x199f2d
+UnknownText_0x199f2d:
 	text "I think there's a"
 	line "move a #MON"
 
 	para "can use while it's"
 	line "frozen."
 	done
-; 0x199f65
 
-BoarderBradSeenText: ; 0x199f65
+BoarderBradSeenText:
 	text "This GYM has a"
 	line "slippery floor."
 
@@ -367,34 +341,29 @@ BoarderBradSeenText: ; 0x199f65
 	line "not playing games"
 	cont "here!"
 	done
-; 0x199fbd
 
-BoarderBradBeatenText: ; 0x199fbd
+BoarderBradBeatenText:
 	text "Do you see how"
 	line "serious we are?"
 	done
-; 0x199fdd
 
-UnknownText_0x199fdd: ; 0x199fdd
+UnknownText_0x199fdd:
 	text "This GYM is great."
 	line "I love boarding"
 	cont "with my #MON!"
 	done
-; 0x19a00f
 
-BoarderDouglasSeenText: ; 0x19a00f
+BoarderDouglasSeenText:
 	text "I know PRYCE's"
 	line "secret."
 	done
-; 0x19a026
 
-BoarderDouglasBeatenText: ; 0x19a026
+BoarderDouglasBeatenText:
 	text "OK. I'll tell you"
 	line "PRYCE's secret."
 	done
-; 0x19a047
 
-UnknownText_0x19a047: ; 0x19a047
+UnknownText_0x19a047:
 	text "The secret behind"
 	line "PRYCE's power…"
 
@@ -404,52 +373,45 @@ UnknownText_0x19a047: ; 0x19a047
 	para "to strengthen his"
 	line "mind and body."
 	done
-; 0x19a0ae
 
-SkierRoxanneSeenText: ; 0x19a0ae
+SkierRoxanneSeenText:
 	text "To get to PRYCE,"
 	line "our GYM LEADER,"
 
 	para "you need to think"
 	line "before you skate."
 	done
-; 0x19a0f4
 
-SkierRoxanneBeatenText: ; 0x19a0f4
+SkierRoxanneBeatenText:
 	text "I wouldn't lose to"
 	line "you in skiing!"
 	done
-; 0x19a116
 
-UnknownText_0x19a116: ; 0x19a116
+UnknownText_0x19a116:
 	text "If you don't skate"
 	line "with precision,"
 
 	para "you won't get far"
 	line "in this GYM."
 	done
-; 0x19a157
 
-SkierClarissaSeenText: ; 0x19a157
+SkierClarissaSeenText:
 	text "Check out my"
 	line "parallel turn!"
 	done
-; 0x19a174
 
-SkierClarissaBeatenText: ; 0x19a174
+SkierClarissaBeatenText:
 	text "No! You made me"
 	line "wipe out!"
 	done
-; 0x19a18f
 
-UnknownText_0x19a18f: ; 0x19a18f
+UnknownText_0x19a18f:
 	text "I shouldn't have"
 	line "been bragging"
 	cont "about my skiing…"
 	done
-; 0x19a1bf
 
-MahoganyGymGuyText: ; 0x19a1bf
+MahoganyGymGuyText:
 	text "PRYCE is a veteran"
 	line "who has trained"
 
@@ -468,9 +430,8 @@ MahoganyGymGuyText: ; 0x19a1bf
 	para "with your burning"
 	line "ambition!"
 	done
-; 0x19a275
 
-MahoganyGymGuyWinText: ; 0x19a275
+MahoganyGymGuyWinText:
 	text "PRYCE is some-"
 	line "thing, but you're"
 	cont "something else!"
@@ -481,9 +442,8 @@ MahoganyGymGuyWinText: ; 0x19a275
 	para "bridged the gen-"
 	line "eration gap!"
 	done
-; 0x19a2df
 
-MahoganyGym_MapEventHeader: ; 0x19a2df
+MahoganyGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -509,4 +469,3 @@ MahoganyGym_MapEventHeader: ; 0x19a2df
 	person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff
 	person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff
 	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff
-; 0x19a354
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 672f6242b..e836b672d 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,16 +1,15 @@
-OlivineGym_MapScriptHeader: ; 0x9c12d
+OlivineGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x9c12f
 
-JasmineScript_0x9c12f: ; 0x9c12f
+JasmineScript_0x9c12f:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_JASMINE
-	iftrue UnknownScript_0x9c159
+	iftrue .FightDone
 	writetext UnknownText_0x9c1b9
 	closetext
 	loadmovesprites
@@ -23,10 +22,10 @@ JasmineScript_0x9c12f: ; 0x9c12f
 	writetext UnknownText_0x9c33a
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $001f
-	checkcode $7
-	scall UnknownScript_0x9c178
-UnknownScript_0x9c159: ; 0x9c159
+	setflag ENGINE_MINERALBADGE
+	checkcode VAR_BADGES
+	scall OlivineGymTriggerRockets
+.FightDone
 	checkevent EVENT_GOT_TM23_IRON_TAIL
 	iftrue UnknownScript_0x9c172
 	writetext UnknownText_0x9c354
@@ -38,31 +37,26 @@ UnknownScript_0x9c159: ; 0x9c159
 	closetext
 	loadmovesprites
 	end
-; 0x9c172
 
-UnknownScript_0x9c172: ; 0x9c172
+UnknownScript_0x9c172:
 	writetext UnknownText_0x9c3d1
 	closetext
-UnknownScript_0x9c176: ; 0x9c176
+UnknownScript_0x9c176:
 	loadmovesprites
 	end
-; 0x9c178
 
-UnknownScript_0x9c178: ; 0x9c178
-	if_equal $7, UnknownScript_0x9c184
-	if_equal $6, UnknownScript_0x9c181
+OlivineGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x9c181
 
-UnknownScript_0x9c181: ; 0x9c181
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x9c184
 
-UnknownScript_0x9c184: ; 0x9c184
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x9c187
 
-OlivineGymGuyScript: ; 0x9c187
+OlivineGymGuyScript:
 	faceplayer
 	checkevent EVENT_BEAT_JASMINE
 	iftrue .OlivineGymGuyWinScript
@@ -73,7 +67,6 @@ OlivineGymGuyScript: ; 0x9c187
 	closetext
 	loadmovesprites
 	end
-; 0x9c19b
 
 .OlivineGymGuyWinScript
 	loadfont
@@ -81,7 +74,6 @@ OlivineGymGuyScript: ; 0x9c187
 	closetext
 	loadmovesprites
 	end
-; 0x9c1a2
 
 .OlivineGymGuyPreScript
 	loadfont
@@ -89,7 +81,6 @@ OlivineGymGuyScript: ; 0x9c187
 	closetext
 	loadmovesprites
 	end
-; 0x9c1a9
 
 OlivineGymStatue:
 	checkflag ENGINE_MINERALBADGE
@@ -99,7 +90,7 @@ OlivineGymStatue:
 	trainertotext JASMINE, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x9c1b9: ; 0x9c1b9
+UnknownText_0x9c1b9:
 	text "…Thank you for"
 	line "your help at the"
 	cont "LIGHTHOUSE…"
@@ -123,9 +114,8 @@ UnknownText_0x9c1b9: ; 0x9c1b9
 
 	para "…Um… May I begin?"
 	done
-; 0x9c2bb
 
-UnknownText_0x9c2bb: ; 0x9c2bb
+UnknownText_0x9c2bb:
 	text "…You are a better"
 	line "trainer than me,"
 
@@ -138,15 +128,13 @@ UnknownText_0x9c2bb: ; 0x9c2bb
 	para "confer upon you"
 	line "this BADGE."
 	done
-; 0x9c33a
 
-UnknownText_0x9c33a: ; 0x9c33a
+UnknownText_0x9c33a:
 	text "<PLAYER> received"
 	line "MINERALBADGE."
 	done
-; 0x9c354
 
-UnknownText_0x9c354: ; 0x9c354
+UnknownText_0x9c354:
 	text "MINERALBADGE"
 	line "raises #MON's"
 	cont "DEFENSE."
@@ -154,29 +142,25 @@ UnknownText_0x9c354: ; 0x9c354
 	para "…Um… Please take"
 	line "this too…"
 	done
-; 0x9c393
 
-UnknownText_0x9c393: ; 0x9c393
+UnknownText_0x9c393:
 	text "<PLAYER> received"
 	line "TM09."
 	done
-; 0x9c3a5
 
-UnknownText_0x9c3a5: ; 0x9c3a5
+UnknownText_0x9c3a5:
 	text "…You could use"
 	line "that TM to teach"
 	cont "IRON TAIL."
 	done
-; 0x9c3d1
 
-UnknownText_0x9c3d1: ; 0x9c3d1
+UnknownText_0x9c3d1:
 	text "Um… I don't know"
 	line "how to say this,"
 	cont "but good luck…"
 	done
-; 0x9c402
 
-OlivineGymGuyText: ; 0x9c402
+OlivineGymGuyText:
 	text "JASMINE uses the"
 	line "newly discovered"
 	cont "steel-type."
@@ -184,9 +168,8 @@ OlivineGymGuyText: ; 0x9c402
 	para "I don't know very"
 	line "much about it."
 	done
-; 0x9c451
 
-OlivineGymGuyWinText: ; 0x9c451
+OlivineGymGuyWinText:
 	text "That was awesome."
 
 	para "The steel-type,"
@@ -196,9 +179,8 @@ OlivineGymGuyWinText: ; 0x9c451
 	line "encounter of an"
 	cont "unknown kind!"
 	done
-; 0x9c4a8
 
-OlivineGymGuyPreText: ; 0x9c4a8
+OlivineGymGuyPreText:
 	text "JASMINE, the GYM"
 	line "LEADER, is at the"
 	cont "LIGHTHOUSE."
@@ -210,9 +192,8 @@ OlivineGymGuyPreText: ; 0x9c4a8
 	line "has to be compas-"
 	cont "sionate."
 	done
-; 0x9c526
 
-OlivineGym_MapEventHeader: ; 0x9c526
+OlivineGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -233,4 +214,3 @@ OlivineGym_MapEventHeader: ; 0x9c526
 	db 2
 	person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, $06d3
 	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff
-; 0x9c55a
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index eeb291f41..0f3d2b64f 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -1,16 +1,15 @@
-PewterGym_MapScriptHeader: ; 0x1a2862
+PewterGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x1a2864
 
-BrockScript_0x1a2864: ; 0x1a2864
+BrockScript_0x1a2864:
 	faceplayer
 	loadfont
-	checkflag $0023
-	iftrue UnknownScript_0x1a2892
+	checkflag ENGINE_BOULDERBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x1a28d0
 	closetext
 	loadmovesprites
@@ -24,21 +23,19 @@ BrockScript_0x1a2864: ; 0x1a2864
 	writetext UnknownText_0x1a2a3d
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0023
+	setflag ENGINE_BOULDERBADGE
 	writetext UnknownText_0x1a2a57
 	closetext
 	loadmovesprites
 	end
-; 0x1a2892
 
-UnknownScript_0x1a2892: ; 0x1a2892
+.FightDone
 	writetext UnknownText_0x1a2ada
 	closetext
 	loadmovesprites
 	end
-; 0x1a2898
 
-TrainerCamperJerry: ; 0x1a2898
+TrainerCamperJerry:
 	; bit/flag number
 	dw $42b
 
@@ -56,18 +53,16 @@ TrainerCamperJerry: ; 0x1a2898
 
 	; script when talk again
 	dw CamperJerryScript
-; 0x1a28a4
 
-CamperJerryScript: ; 0x1a28a4
+CamperJerryScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1a2c0f
 	closetext
 	loadmovesprites
 	end
-; 0x1a28ac
 
-PewterGymGuyScript: ; 0x1a28ac
+PewterGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_BROCK
@@ -82,7 +77,6 @@ PewterGymGuyScript: ; 0x1a28ac
 	closetext
 	loadmovesprites
 	end
-; 0x1a28c0
 
 PewterGymStatue:
 	checkflag ENGINE_BOULDERBADGE
@@ -92,7 +86,7 @@ PewterGymStatue:
 	trainertotext BROCK, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x1a28d0: ; 0x1a28d0
+UnknownText_0x1a28d0:
 	text "BROCK: Wow, it's"
 	line "not often that we"
 
@@ -116,9 +110,8 @@ UnknownText_0x1a28d0: ; 0x1a28d0
 
 	para "Come on!"
 	done
-; 0x1a29bb
 
-UnknownText_0x1a29bb: ; 0x1a29bb
+UnknownText_0x1a29bb:
 	text "BROCK: Your #-"
 	line "MON's powerful at-"
 	cont "tacks overcame my"
@@ -130,15 +123,13 @@ UnknownText_0x1a29bb: ; 0x1a29bb
 	para "Go ahead--take"
 	line "this BADGE."
 	done
-; 0x1a2a3d
 
-UnknownText_0x1a2a3d: ; 0x1a2a3d
+UnknownText_0x1a2a3d:
 	text "<PLAYER> received"
 	line "BOULDERBADGE."
 	done
-; 0x1a2a57
 
-UnknownText_0x1a2a57: ; 0x1a2a57
+UnknownText_0x1a2a57:
 	text "BROCK: <PLAY_G>,"
 	line "thanks. I enjoyed"
 
@@ -152,9 +143,8 @@ UnknownText_0x1a2a57: ; 0x1a2a57
 	para "#MON even more"
 	line "powerful."
 	done
-; 0x1a2ada
 
-UnknownText_0x1a2ada: ; 0x1a2ada
+UnknownText_0x1a2ada:
 	text "BROCK: The world"
 	line "is huge. There are"
 
@@ -166,9 +156,8 @@ UnknownText_0x1a2ada: ; 0x1a2ada
 	cont "come a lot strong-"
 	cont "er too."
 	done
-; 0x1a2b62
 
-CamperJerrySeenText: ; 0x1a2b62
+CamperJerrySeenText:
 	text "The trainers of"
 	line "this GYM use rock-"
 	cont "type #MON."
@@ -182,15 +171,13 @@ CamperJerrySeenText: ; 0x1a2b62
 	para "time. Are you"
 	line "ready for this?"
 	done
-; 0x1a2bf1
 
-CamperJerryBeatenText: ; 0x1a2bf1
+CamperJerryBeatenText:
 	text "I have to win"
 	line "these battles…"
 	done
-; 0x1a2c0f
 
-UnknownText_0x1a2c0f: ; 0x1a2c0f
+UnknownText_0x1a2c0f:
 	text "Hey, you! Trainer"
 	line "from JOHTO! BROCK"
 
@@ -200,9 +187,8 @@ UnknownText_0x1a2c0f: ; 0x1a2c0f
 	para "don't take him"
 	line "seriously."
 	done
-; 0x1a2c6e
 
-PewterGymGuyText: ; 0x1a2c6e
+PewterGymGuyText:
 	text "Yo! CHAMP in"
 	line "making! You're"
 
@@ -218,9 +204,8 @@ PewterGymGuyText: ; 0x1a2c6e
 	para "just like JOHTO's"
 	line "GYM LEADERS."
 	done
-; 0x1a2d07
 
-PewterGymGuyWinText: ; 0x1a2d07
+PewterGymGuyWinText:
 	text "Yo! CHAMP in"
 	line "making! That GYM"
 
@@ -233,9 +218,8 @@ PewterGymGuyWinText: ; 0x1a2d07
 	para "inspiring. I mean"
 	line "that seriously."
 	done
-; 0x1a2d88
 
-PewterGym_MapEventHeader: ; 0x1a2d88
+PewterGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -257,4 +241,3 @@ PewterGym_MapEventHeader: ; 0x1a2d88
 	person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, $ffff
 	person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff
 	person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff
-; 0x1a2dc9
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index 8945a13c0..2a164d12d 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,16 +1,15 @@
-SaffronGym_MapScriptHeader: ; 0x189c2c
+SaffronGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x189c2e
 
-SabrinaScript_0x189c2e: ; 0x189c2e
+SabrinaScript_0x189c2e:
 	faceplayer
 	loadfont
-	checkflag $0028
-	iftrue UnknownScript_0x189c65
+	checkflag ENGINE_MARSHBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x189cdf
 	closetext
 	loadmovesprites
@@ -27,21 +26,19 @@ SabrinaScript_0x189c2e: ; 0x189c2e
 	writetext UnknownText_0x189e95
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0028
+	setflag ENGINE_MARSHBADGE
 	writetext UnknownText_0x189ead
 	closetext
 	loadmovesprites
 	end
-; 0x189c65
 
-UnknownScript_0x189c65: ; 0x189c65
+.FightDone
 	writetext UnknownText_0x189f6c
 	closetext
 	loadmovesprites
 	end
-; 0x189c6b
 
-TrainerMediumRebecca: ; 0x189c6b
+TrainerMediumRebecca:
 	; bit/flag number
 	dw $590
 
@@ -59,18 +56,16 @@ TrainerMediumRebecca: ; 0x189c6b
 
 	; script when talk again
 	dw MediumRebeccaScript
-; 0x189c77
 
-MediumRebeccaScript: ; 0x189c77
+MediumRebeccaScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18a034
 	closetext
 	loadmovesprites
 	end
-; 0x189c7f
 
-TrainerPsychicFranklin: ; 0x189c7f
+TrainerPsychicFranklin:
 	; bit/flag number
 	dw $43b
 
@@ -88,18 +83,16 @@ TrainerPsychicFranklin: ; 0x189c7f
 
 	; script when talk again
 	dw PsychicFranklinScript
-; 0x189c8b
 
-PsychicFranklinScript: ; 0x189c8b
+PsychicFranklinScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18a0a6
 	closetext
 	loadmovesprites
 	end
-; 0x189c93
 
-TrainerMediumDoris: ; 0x189c93
+TrainerMediumDoris:
 	; bit/flag number
 	dw $591
 
@@ -117,18 +110,16 @@ TrainerMediumDoris: ; 0x189c93
 
 	; script when talk again
 	dw MediumDorisScript
-; 0x189c9f
 
-MediumDorisScript: ; 0x189c9f
+MediumDorisScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18a136
 	closetext
 	loadmovesprites
 	end
-; 0x189ca7
 
-TrainerPsychicJared: ; 0x189ca7
+TrainerPsychicJared:
 	; bit/flag number
 	dw $444
 
@@ -146,18 +137,16 @@ TrainerPsychicJared: ; 0x189ca7
 
 	; script when talk again
 	dw PsychicJaredScript
-; 0x189cb3
 
-PsychicJaredScript: ; 0x189cb3
+PsychicJaredScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x18a1b3
 	closetext
 	loadmovesprites
 	end
-; 0x189cbb
 
-SaffronGymGuyScript: ; 0x189cbb
+SaffronGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_SABRINA
@@ -172,7 +161,6 @@ SaffronGymGuyScript: ; 0x189cbb
 	closetext
 	loadmovesprites
 	end
-; 0x189ccf
 
 SaffronGymStatue:
 	checkflag ENGINE_MARSHBADGE
@@ -182,7 +170,7 @@ SaffronGymStatue:
 	trainertotext SABRINA, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x189cdf: ; 0x189cdf
+UnknownText_0x189cdf:
 	text "SABRINA: I knew"
 	line "you were coming…"
 
@@ -207,9 +195,8 @@ UnknownText_0x189cdf: ; 0x189cdf
 	line "I will show you my"
 	cont "psychic powers!"
 	done
-; 0x189df4
 
-UnknownText_0x189df4: ; 0x189df4
+UnknownText_0x189df4:
 	text "SABRINA: Your"
 	line "power…"
 
@@ -226,15 +213,13 @@ UnknownText_0x189df4: ; 0x189df4
 	line "earned yourself"
 	cont "MARSHBADGE."
 	done
-; 0x189e95
 
-UnknownText_0x189e95: ; 0x189e95
+UnknownText_0x189e95:
 	text "<PLAYER> received"
 	line "MARSHBADGE."
 	done
-; 0x189ead
 
-UnknownText_0x189ead: ; 0x189ead
+UnknownText_0x189ead:
 	text "SABRINA: MARSH-"
 	line "BADGE draws out"
 
@@ -251,9 +236,8 @@ UnknownText_0x189ead: ; 0x189ead
 	line "celebrated and"
 	cont "beloved CHAMPION!"
 	done
-; 0x189f6c
 
-UnknownText_0x189f6c: ; 0x189f6c
+UnknownText_0x189f6c:
 	text "SABRINA: Your love"
 	line "for your #MON"
 
@@ -266,82 +250,70 @@ UnknownText_0x189f6c: ; 0x189f6c
 	para "kind of psychic"
 	line "power…"
 	done
-; 0x189fe9
 
-MediumRebeccaSeenText: ; 0x189fe9
+MediumRebeccaSeenText:
 	text "The power of all"
 	line "those you defeated"
 	cont "comes to me!"
 	done
-; 0x18a01b
 
-MediumRebeccaBeatenText: ; 0x18a01b
+MediumRebeccaBeatenText:
 	text "Strong…"
 	line "Far too strong…"
 	done
-; 0x18a034
 
-UnknownText_0x18a034: ; 0x18a034
+UnknownText_0x18a034:
 	text "What is the source"
 	line "of your power?"
 	done
-; 0x18a057
 
-PsychicFranklinSeenText: ; 0x18a057
+PsychicFranklinSeenText:
 	text "Psychic power is"
 	line "the power of your"
 	cont "soul."
 	done
-; 0x18a081
 
-PsychicFranklinBeatenText: ; 0x18a081
+PsychicFranklinBeatenText:
 	text "Your soul has more"
 	line "power than mine!"
 	done
-; 0x18a0a6
 
-UnknownText_0x18a0a6: ; 0x18a0a6
+UnknownText_0x18a0a6:
 	text "You made your soul"
 	line "stronger, not just"
 	cont "your abilities."
 	done
-; 0x18a0dd
 
-MediumDorisSeenText: ; 0x18a0dd
+MediumDorisSeenText:
 	text "Fufufufu…"
 	line "I see it clearly."
 
 	para "I can see into"
 	line "your soul!"
 	done
-; 0x18a114
 
-MediumDorisBeatenText: ; 0x18a114
+MediumDorisBeatenText:
 	text "Though I read you,"
 	line "I still lost…"
 	done
-; 0x18a136
 
-UnknownText_0x18a136: ; 0x18a136
+UnknownText_0x18a136:
 	text "Darn! I forgot"
 	line "that I predicted I"
 	cont "would lose to you."
 	done
-; 0x18a16c
 
-PsychicJaredSeenText: ; 0x18a16c
+PsychicJaredSeenText:
 	text "The FIGHTING DOJO"
 	line "next door was once"
 	cont "this city's GYM."
 	done
-; 0x18a1a2
 
-PsychicJaredBeatenText: ; 0x18a1a2
+PsychicJaredBeatenText:
 	text "I was no match…"
 	done
-; 0x18a1b3
 
-UnknownText_0x18a1b3: ; 0x18a1b3
+UnknownText_0x18a1b3:
 	text "KARATE KING, the"
 	line "master of the"
 
@@ -349,9 +321,8 @@ UnknownText_0x18a1b3: ; 0x18a1b3
 	line "just destroyed by"
 	cont "SABRINA."
 	done
-; 0x18a201
 
-SaffronGymGuyText: ; 0x18a201
+SaffronGymGuyText:
 	text "Yo, CHAMP in"
 	line "making!"
 
@@ -369,15 +340,13 @@ SaffronGymGuyText: ; 0x18a201
 
 	para "Good luck!"
 	done
-; 0x18a2a0
 
-SaffronGymGuyWinText: ; 0x18a2a0
+SaffronGymGuyWinText:
 	text "That was another"
 	line "fantastic battle!"
 	done
-; 0x18a2c4
 
-SaffronGym_MapEventHeader: ; 0x18a2c4
+SaffronGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -431,4 +400,3 @@ SaffronGym_MapEventHeader: ; 0x18a2c4
 	person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff
 	person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff
 	person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff
-; 0x18a3bd
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 6d9abd027..2f325690c 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,4 +1,4 @@
-SeafoamGym_MapScriptHeader: ; 0x1ab4f4
+SeafoamGym_MapScriptHeader:
 	; trigger count
 	db 1
 
@@ -7,47 +7,43 @@ SeafoamGym_MapScriptHeader: ; 0x1ab4f4
 
 	; callback count
 	db 0
-; 0x1ab4fa
 
-UnknownScript_0x1ab4fa: ; 0x1ab4fa
+UnknownScript_0x1ab4fa:
 	end
-; 0x1ab4fb
 
-BlaineScript_0x1ab4fb: ; 0x1ab4fb
+BlaineScript_0x1ab4fb:
 	faceplayer
 	loadfont
-	checkflag $0029
-	iftrue UnknownScript_0x1ab52b
+	checkflag ENGINE_VOLCANOBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x1ab548
 	closetext
 	loadmovesprites
 	winlosstext UnknownText_0x1ab646, $0000
 	loadtrainer BLAINE, 1
 	startbattle
-	iftrue UnknownScript_0x1ab516
+	iftrue .ReturnAfterBattle
 	appear $3
-UnknownScript_0x1ab516: ; 0x1ab516
+.ReturnAfterBattle
 	returnafterbattle
-	setevent $04cb
+	setevent EVENT_BEAT_BLAINE
 	loadfont
 	writetext UnknownText_0x1ab683
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0029
+	setflag ENGINE_VOLCANOBADGE
 	writetext UnknownText_0x1ab69d
 	closetext
 	loadmovesprites
 	end
-; 0x1ab52b
 
-UnknownScript_0x1ab52b: ; 0x1ab52b
+.FightDone
 	writetext UnknownText_0x1ab71c
 	closetext
 	loadmovesprites
 	end
-; 0x1ab531
 
-SeafoamGymGuyScript: ; 0x1ab531
+SeafoamGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
@@ -63,9 +59,8 @@ SeafoamGymGuyScript: ; 0x1ab531
 	closetext
 	loadmovesprites
 	end
-; 0x1ab548
 
-UnknownText_0x1ab548: ; 0x1ab548
+UnknownText_0x1ab548:
 	text "BLAINE: Waaah!"
 
 	para "My GYM in CINNABAR"
@@ -92,24 +87,21 @@ UnknownText_0x1ab548: ; 0x1ab548
 	para "Ha! You'd better"
 	line "have BURN HEAL!"
 	done
-; 0x1ab646
 
-UnknownText_0x1ab646: ; 0x1ab646
+UnknownText_0x1ab646:
 	text "BLAINE: Awesome."
 	line "I've burned out…"
 
 	para "You've earned"
 	line "VOLCANOBADGE!"
 	done
-; 0x1ab683
 
-UnknownText_0x1ab683: ; 0x1ab683
+UnknownText_0x1ab683:
 	text "<PLAYER> received"
 	line "VOLCANOBADGE."
 	done
-; 0x1ab69d
 
-UnknownText_0x1ab69d: ; 0x1ab69d
+UnknownText_0x1ab69d:
 	text "BLAINE: I did lose"
 	line "this time, but I'm"
 
@@ -122,18 +114,16 @@ UnknownText_0x1ab69d: ; 0x1ab69d
 	para "we'll have to have"
 	line "a rematch."
 	done
-; 0x1ab71c
 
-UnknownText_0x1ab71c: ; 0x1ab71c
+UnknownText_0x1ab71c:
 	text "BLAINE: My fire"
 	line "#MON will be"
 
 	para "even stronger."
 	line "Just you watch!"
 	done
-; 0x1ab759
 
-SeafoamGymGuyWinText: ; 0x1ab759
+SeafoamGymGuyWinText:
 	text "Yo!"
 
 	para "… Huh? It's over"
@@ -153,9 +143,8 @@ SeafoamGymGuyWinText: ; 0x1ab759
 	para "without my advice."
 	line "I knew you'd win!"
 	done
-; 0x1ab806
 
-SeafoamGymGuyWinText2: ; 0x1ab806
+SeafoamGymGuyWinText2:
 	text "A #MON GYM can"
 	line "be anywhere as"
 
@@ -165,9 +154,8 @@ SeafoamGymGuyWinText2: ; 0x1ab806
 	para "There's no need"
 	line "for a building."
 	done
-; 0x1ab865
 
-SeafoamGym_MapEventHeader: ; 0x1ab865
+SeafoamGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -185,4 +173,3 @@ SeafoamGym_MapEventHeader: ; 0x1ab865
 	db 2
 	person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, $ffff
 	person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777
-; 0x1ab88a
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index e0a500b86..8bc936870 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -1,16 +1,15 @@
-VermilionGym_MapScriptHeader: ; 0x1920a3
+VermilionGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x1920a5
 
-SurgeScript_0x1920a5: ; 0x1920a5
+SurgeScript_0x1920a5:
 	faceplayer
 	loadfont
-	checkflag $0025
-	iftrue UnknownScript_0x1920d9
+	checkflag ENGINE_THUNDERBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x192142
 	closetext
 	loadmovesprites
@@ -26,21 +25,19 @@ SurgeScript_0x1920a5: ; 0x1920a5
 	writetext UnknownText_0x192277
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $0025
+	setflag ENGINE_THUNDERBADGE
 	writetext UnknownText_0x192291
 	closetext
 	loadmovesprites
 	end
-; 0x1920d9
 
-UnknownScript_0x1920d9: ; 0x1920d9
+.FightDone
 	writetext UnknownText_0x192303
 	closetext
 	loadmovesprites
 	end
-; 0x1920df
 
-TrainerGentlemanGregory: ; 0x1920df
+TrainerGentlemanGregory:
 	; bit/flag number
 	dw $49c
 
@@ -58,18 +55,16 @@ TrainerGentlemanGregory: ; 0x1920df
 
 	; script when talk again
 	dw GentlemanGregoryScript
-; 0x1920eb
 
-GentlemanGregoryScript: ; 0x1920eb
+GentlemanGregoryScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1923b0
 	closetext
 	loadmovesprites
 	end
-; 0x1920f3
 
-TrainerGuitaristVincent: ; 0x1920f3
+TrainerGuitaristVincent:
 	; bit/flag number
 	dw $494
 
@@ -87,18 +82,16 @@ TrainerGuitaristVincent: ; 0x1920f3
 
 	; script when talk again
 	dw GuitaristVincentScript
-; 0x1920ff
 
-GuitaristVincentScript: ; 0x1920ff
+GuitaristVincentScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x19244b
 	closetext
 	loadmovesprites
 	end
-; 0x192107
 
-TrainerJugglerHorton: ; 0x192107
+TrainerJugglerHorton:
 	; bit/flag number
 	dw $497
 
@@ -116,18 +109,16 @@ TrainerJugglerHorton: ; 0x192107
 
 	; script when talk again
 	dw JugglerHortonScript
-; 0x192113
 
-JugglerHortonScript: ; 0x192113
+JugglerHortonScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1924d6
 	closetext
 	loadmovesprites
 	end
-; 0x19211b
 
-VermilionGymGuyScript: ; 0x19211b
+VermilionGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_LTSURGE
@@ -142,11 +133,9 @@ VermilionGymGuyScript: ; 0x19211b
 	closetext
 	loadmovesprites
 	end
-; 0x19212f
 
-MapVermilionGymSignpost14Script: ; 0x19212f
+MapVermilionGymSignpost14Script:
 	jumptext UnknownText_0x19261e
-; 0x192132
 
 VermilionGymStatue:
 	checkflag ENGINE_THUNDERBADGE
@@ -156,7 +145,7 @@ VermilionGymStatue:
 	trainertotext LT_SURGE, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x192142: ; 0x192142
+UnknownText_0x192142:
 	text "SURGE: Hey, you"
 	line "little tyke!"
 
@@ -178,24 +167,21 @@ UnknownText_0x192142: ; 0x192142
 	line "like I did my"
 	cont "enemies in war!"
 	done
-; 0x192238
 
-UnknownText_0x192238: ; 0x192238
+UnknownText_0x192238:
 	text "SURGE: Arrrgh!"
 	line "You are strong!"
 
 	para "OK, kid. You get"
 	line "THUNDERBADGE!"
 	done
-; 0x192277
 
-UnknownText_0x192277: ; 0x192277
+UnknownText_0x192277:
 	text "<PLAYER> received"
 	line "THUNDERBADGE."
 	done
-; 0x192291
 
-UnknownText_0x192291: ; 0x192291
+UnknownText_0x192291:
 	text "SURGE: THUNDER-"
 	line "BADGE increases"
 	cont "#MON's speed. "
@@ -206,9 +192,8 @@ UnknownText_0x192291: ; 0x192291
 	para "me. You wear it"
 	line "proudly, hear?"
 	done
-; 0x192303
 
-UnknownText_0x192303: ; 0x192303
+UnknownText_0x192303:
 	text "SURGE: Hey, kid!"
 	line "Still slugging and"
 	cont "chugging away?"
@@ -216,34 +201,30 @@ UnknownText_0x192303: ; 0x192303
 	para "My #MON and I"
 	line "are still at it!"
 	done
-; 0x192356
 
-GentlemanGregorySeenText: ; 0x192356
+GentlemanGregorySeenText:
 	text "You're here to"
 	line "defeat LT.SURGE?"
 
 	para "Not if I can help"
 	line "it!"
 	done
-; 0x19238c
 
-GentlemanGregoryBeatenText: ; 0x19238c
+GentlemanGregoryBeatenText:
 	text "Sorry I failed"
 	line "you, LT.SURGE,"
 	cont "sir!"
 	done
-; 0x1923b0
 
-UnknownText_0x1923b0: ; 0x1923b0
+UnknownText_0x1923b0:
 	text "When I was still"
 	line "in the army, LT."
 
 	para "SURGE saved my"
 	line "life."
 	done
-; 0x1923e8
 
-GuitaristVincentSeenText: ; 0x1923e8
+GuitaristVincentSeenText:
 	text "LT.SURGE recog-"
 	line "nized my potential"
 
@@ -253,45 +234,39 @@ GuitaristVincentSeenText: ; 0x1923e8
 	para "Think you can beat"
 	line "me?"
 	done
-; 0x192437
 
-GuitaristVincentBeatenText: ; 0x192437
+GuitaristVincentBeatenText:
 	text "Ooh, how shocking!"
 	done
-; 0x19244b
 
-UnknownText_0x19244b: ; 0x19244b
+UnknownText_0x19244b:
 	text "If the GYM's traps"
 	line "were working, you"
 
 	para "would have been"
 	line "toast…"
 	done
-; 0x192487
 
-JugglerHortonSeenText: ; 0x192487
+JugglerHortonSeenText:
 	text "I'm going to take"
 	line "you down! Prepare"
 	cont "to be shocked!"
 	done
-; 0x1924ba
 
-JugglerHortonBeatenText: ; 0x1924ba
+JugglerHortonBeatenText:
 	text "Gwaaah!"
 	line "I was overpowered…"
 	done
-; 0x1924d6
 
-UnknownText_0x1924d6: ; 0x1924d6
+UnknownText_0x1924d6:
 	text "Don't get too com-"
 	line "fortable about"
 
 	para "beating me…"
 	line "LT.SURGE is tough."
 	done
-; 0x192517
 
-VermilionGymGuyText: ; 0x192517
+VermilionGymGuyText:
 	text "Yo! CHAMP in"
 	line "making!"
 
@@ -312,24 +287,21 @@ VermilionGymGuyText: ; 0x192517
 	line "problem getting to"
 	cont "LT.SURGE."
 	done
-; 0x1925df
 
-VermilionGymGuyWinText: ; 0x1925df
+VermilionGymGuyWinText:
 	text "Whew! That was an"
 	line "electrifying bout!"
 
 	para "It sure made me"
 	line "nervous."
 	done
-; 0x19261e
 
-UnknownText_0x19261e: ; 0x19261e
+UnknownText_0x19261e:
 	text "Nope! Nothing here"
 	line "but trash."
 	done
-; 0x19263d
 
-VermilionGym_MapEventHeader: ; 0x19263d
+VermilionGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -368,4 +340,3 @@ VermilionGym_MapEventHeader: ; 0x19263d
 	person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, $ffff
 	person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff
 	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff
-; 0x1926e3
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index bcf9baca7..988bebc6b 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,16 +1,15 @@
-VioletGym_MapScriptHeader: ; 0x683c0
+VioletGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x683c2
 
-FalknerScript_0x683c2: ; 0x683c2
+FalknerScript_0x683c2:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_FALKNER
-	iftrue UnknownScript_0x683ec
+	iftrue .FightDone
 	writetext UnknownText_0x68473
 	closetext
 	loadmovesprites
@@ -23,10 +22,10 @@ FalknerScript_0x683c2: ; 0x683c2
 	writetext UnknownText_0x685af
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $001b
+	setflag ENGINE_ZEPHYRBADGE
 	checkcode VAR_BADGES
-	scall UnknownScript_0x68418
-UnknownScript_0x683ec: ; 0x683ec
+	scall VioletGymTriggerRockets
+.FightDone
 	checkevent EVENT_GOT_TM31_MUD_SLAP
 	iftrue UnknownScript_0x68412
 	setevent EVENT_BEAT_BIRD_KEEPER_ROD
@@ -42,31 +41,26 @@ UnknownScript_0x683ec: ; 0x683ec
 	closetext
 	loadmovesprites
 	end
-; 0x68412
 
-UnknownScript_0x68412: ; 0x68412
+UnknownScript_0x68412:
 	writetext UnknownText_0x68735
 	closetext
-UnknownScript_0x68416: ; 0x68416
+UnknownScript_0x68416:
 	loadmovesprites
 	end
-; 0x68418
 
-UnknownScript_0x68418: ; 0x68418
-	if_equal $7, UnknownScript_0x68424
-	if_equal $6, UnknownScript_0x68421
+VioletGymTriggerRockets:
+	if_equal 7, .RadioTowerRockets
+	if_equal 6, .GoldenrodRockets
 	end
-; 0x68421
 
-UnknownScript_0x68421: ; 0x68421
+.GoldenrodRockets
 	jumpstd goldenrodrockets
-; 0x68424
 
-UnknownScript_0x68424: ; 0x68424
+.RadioTowerRockets
 	jumpstd radiotowerrockets
-; 0x68427
 
-TrainerBird_keeperRod: ; 0x68427
+TrainerBird_keeperRod:
 	; bit/flag number
 	dw $3fb
 
@@ -84,18 +78,16 @@ TrainerBird_keeperRod: ; 0x68427
 
 	; script when talk again
 	dw Bird_keeperRodScript
-; 0x68433
 
-Bird_keeperRodScript: ; 0x68433
+Bird_keeperRodScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x68837
 	closetext
 	loadmovesprites
 	end
-; 0x6843b
 
-TrainerBird_keeperAbe: ; 0x6843b
+TrainerBird_keeperAbe:
 	; bit/flag number
 	dw $3fc
 
@@ -113,18 +105,16 @@ TrainerBird_keeperAbe: ; 0x6843b
 
 	; script when talk again
 	dw Bird_keeperAbeScript
-; 0x68447
 
-Bird_keeperAbeScript: ; 0x68447
+Bird_keeperAbeScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x688c7
 	closetext
 	loadmovesprites
 	end
-; 0x6844f
 
-VioletGymGuyScript: ; 0x6844f
+VioletGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_FALKNER
@@ -139,7 +129,6 @@ VioletGymGuyScript: ; 0x6844f
 	closetext
 	loadmovesprites
 	end
-; 0x68463
 
 VioletGymStatue:
 	checkflag ENGINE_ZEPHYRBADGE
@@ -149,7 +138,7 @@ VioletGymStatue:
 	trainertotext FALKNER, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x68473: ; 0x68473
+UnknownText_0x68473:
 	text "I'm FALKNER, the"
 	line "VIOLET #MON GYM"
 	cont "leader!"
@@ -171,9 +160,8 @@ UnknownText_0x68473: ; 0x68473
 	para "magnificent bird"
 	line "#MON!"
 	done
-; 0x6854a
 
-UnknownText_0x6854a: ; 0x6854a
+UnknownText_0x6854a:
 	text "…Darn! My dad's"
 	line "cherished bird"
 	cont "#MON…"
@@ -185,15 +173,13 @@ UnknownText_0x6854a: ; 0x6854a
 	line "#MON LEAGUE"
 	cont "ZEPHYRBADGE."
 	done
-; 0x685af
 
-UnknownText_0x685af: ; 0x685af
+UnknownText_0x685af:
 	text "<PLAYER> received"
 	line "ZEPHYRBADGE."
 	done
-; 0x685c8
 
-UnknownText_0x685c8: ; 0x685c8
+UnknownText_0x685c8:
 	text "ZEPHYRBADGE"
 	line "raises the attack"
 	cont "power of #MON."
@@ -207,9 +193,8 @@ UnknownText_0x685c8: ; 0x685c8
 	para "Here--take this"
 	line "too."
 	done
-; 0x68648
 
-UnknownText_0x68648: ; 0x68648
+UnknownText_0x68648:
 	text "By using a TM, a"
 	line "#MON will"
 
@@ -233,9 +218,8 @@ UnknownText_0x68648: ; 0x68648
 	line "is both defensive"
 	cont "and offensive."
 	done
-; 0x68735
 
-UnknownText_0x68735: ; 0x68735
+UnknownText_0x68735:
 	text "There are #MON"
 	line "GYMS in cities and"
 	cont "towns ahead."
@@ -250,9 +234,8 @@ UnknownText_0x68735: ; 0x68735
 	para "the greatest bird"
 	line "master!"
 	done
-; 0x687cd
 
-Bird_keeperRodSeenText: ; 0x687cd
+Bird_keeperRodSeenText:
 	text "The keyword is"
 	line "guts!"
 
@@ -264,14 +247,12 @@ Bird_keeperRodSeenText: ; 0x687cd
 
 	para "Come on!"
 	done
-; 0x6882f
 
-Bird_keeperRodBeatenText: ; 0x6882f
+Bird_keeperRodBeatenText:
 	text "Gaaah!"
 	done
-; 0x68837
 
-UnknownText_0x68837: ; 0x68837
+UnknownText_0x68837:
 	text "FALKNER's skills"
 	line "are for real!"
 
@@ -279,29 +260,25 @@ UnknownText_0x68837: ; 0x68837
 	line "just because you"
 	cont "beat me!"
 	done
-; 0x6887f
 
-Bird_keeperAbeSeenText: ; 0x6887f
+Bird_keeperAbeSeenText:
 	text "Let me see if you"
 	line "are good enough to"
 	cont "face FALKNER!"
 	done
-; 0x688b3
 
-Bird_keeperAbeBeatenText: ; 0x688b3
+Bird_keeperAbeBeatenText:
 	text "This can't be"
 	line "true!"
 	done
-; 0x688c7
 
-UnknownText_0x688c7: ; 0x688c7
+UnknownText_0x688c7:
 	text "This is pathetic,"
 	line "losing to some"
 	cont "rookie trainer…"
 	done
-; 0x688f9
 
-VioletGymGuyText: ; 0x688f9
+VioletGymGuyText:
 	text "Hey! I'm no train-"
 	line "er but I can give"
 	cont "some advice!"
@@ -321,18 +298,16 @@ VioletGymGuyText: ; 0x688f9
 	para "flying-type. Keep"
 	line "this in mind."
 	done
-; 0x689c8
 
-VioletGymGuyWinText: ; 0x689c8
+VioletGymGuyWinText:
 	text "Nice battle! Keep"
 	line "it up, and you'll"
 
 	para "be the CHAMP in no"
 	line "time at all!"
 	done
-; 0x68a0c
 
-VioletGym_MapEventHeader: ; 0x68a0c
+VioletGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -355,4 +330,3 @@ VioletGym_MapEventHeader: ; 0x68a0c
 	person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, $ffff
 	person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff
 	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff
-; 0x68a5a
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index 84d89c35c..27750116e 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,16 +1,15 @@
-ViridianGym_MapScriptHeader: ; 0x9aa24
+ViridianGym_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x9aa26
 
-BlueScript_0x9aa26: ; 0x9aa26
+BlueScript_0x9aa26:
 	faceplayer
 	loadfont
-	checkflag $002a
-	iftrue UnknownScript_0x9aa51
+	checkflag ENGINE_EARTHBADGE
+	iftrue .FightDone
 	writetext UnknownText_0x9aa7b
 	closetext
 	loadmovesprites
@@ -23,21 +22,19 @@ BlueScript_0x9aa26: ; 0x9aa26
 	writetext UnknownText_0x9ac0f
 	playsound SFX_GET_BADGE
 	waitbutton
-	setflag $002a
+	setflag ENGINE_EARTHBADGE
 	writetext UnknownText_0x9ac27
 	closetext
 	loadmovesprites
 	end
-; 0x9aa51
 
-UnknownScript_0x9aa51: ; 0x9aa51
+.FightDone
 	writetext UnknownText_0x9acab
 	closetext
 	loadmovesprites
 	end
-; 0x9aa57
 
-ViridianGymGuyScript: ; 0x9aa57
+ViridianGymGuyScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_BEAT_BLUE
@@ -52,7 +49,6 @@ ViridianGymGuyScript: ; 0x9aa57
 	closetext
 	loadmovesprites
 	end
-; 0x9aa6b
 
 ViridianGymStatue:
 	checkflag ENGINE_EARTHBADGE
@@ -62,7 +58,7 @@ ViridianGymStatue:
 	trainertotext BLUE, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x9aa7b: ; 0x9aa7b
+UnknownText_0x9aa7b:
 	text "BLUE: Yo! Finally"
 	line "got here, huh?"
 
@@ -94,9 +90,8 @@ UnknownText_0x9aa7b: ; 0x9aa7b
 	para "Ready, JOHTO"
 	line "CHAMP?"
 	done
-; 0x9abae
 
-UnknownText_0x9abae: ; 0x9abae
+UnknownText_0x9abae:
 	text "BLUE: What?"
 
 	para "How the heck did I"
@@ -108,15 +103,13 @@ UnknownText_0x9abae: ; 0x9abae
 	line "Here, take this--"
 	cont "it's EARTHBADGE."
 	done
-; 0x9ac0f
 
-UnknownText_0x9ac0f: ; 0x9ac0f
+UnknownText_0x9ac0f:
 	text "<PLAYER> received"
 	line "EARTHBADGE."
 	done
-; 0x9ac27
 
-UnknownText_0x9ac27: ; 0x9ac27
+UnknownText_0x9ac27:
 	text "BLUE: …"
 
 	para "All right, I was"
@@ -131,18 +124,16 @@ UnknownText_0x9ac27: ; 0x9ac27
 	para "Don't you forget"
 	line "it!"
 	done
-; 0x9acab
 
-UnknownText_0x9acab: ; 0x9acab
+UnknownText_0x9acab:
 	text "BLUE: Listen, you."
 
 	para "You'd better not"
 	line "lose until I beat"
 	cont "you. Got it?"
 	done
-; 0x9acee
 
-ViridianGymGuyText: ; 0x9acee
+ViridianGymGuyText:
 	text "Yo, CHAMP in"
 	line "making!"
 
@@ -161,9 +152,8 @@ ViridianGymGuyText: ; 0x9acee
 	para "Give it everything"
 	line "you've got!"
 	done
-; 0x9ada0
 
-ViridianGymGuyWinText: ; 0x9ada0
+ViridianGymGuyWinText:
 	text "Man, you are truly"
 	line "tough…"
 
@@ -173,9 +163,8 @@ ViridianGymGuyWinText: ; 0x9ada0
 	para "battle. It brought"
 	line "tears to my eyes."
 	done
-; 0x9ae04
 
-ViridianGym_MapEventHeader: ; 0x9ae04
+ViridianGym_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -196,4 +185,3 @@ ViridianGym_MapEventHeader: ; 0x9ae04
 	db 2
 	person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, $0776
 	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776
-; 0x9ae38