Clean up gym leader scripts.

1 files changed, 20 insertions, 37 deletions

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