Fill out trainer event flags.

maps/Route12.asm

@@ -1,14 +1,13 @@
-Route12_MapScriptHeader: ; 0x1a6fb3
+Route12_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x1a6fb5
 
-TrainerFisherKyle: ; 0x1a6fb5
+TrainerFisherKyle:
 	; bit/flag number
-	dw $451
+	dw EVENT_BEAT_FISHER_KYLE
 
 	; trainer group && trainer id
 	db FISHER, KYLE
@@ -24,20 +23,18 @@ TrainerFisherKyle: ; 0x1a6fb5
 
 	; script when talk again
 	dw FisherKyleScript
-; 0x1a6fc1
 
-FisherKyleScript: ; 0x1a6fc1
+FisherKyleScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1a7238
 	closetext
 	loadmovesprites
 	end
-; 0x1a6fc9
 
-TrainerFisherMartin: ; 0x1a6fc9
+TrainerFisherMartin:
 	; bit/flag number
-	dw $45a
+	dw EVENT_BEAT_FISHER_MARTIN
 
 	; trainer group && trainer id
 	db FISHER, MARTIN
@@ -53,20 +50,18 @@ TrainerFisherMartin: ; 0x1a6fc9
 
 	; script when talk again
 	dw FisherMartinScript
-; 0x1a6fd5
 
-FisherMartinScript: ; 0x1a6fd5
+FisherMartinScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1a704c
 	closetext
 	loadmovesprites
 	end
-; 0x1a6fdd
 
-TrainerFisherStephen: ; 0x1a6fdd
+TrainerFisherStephen:
 	; bit/flag number
-	dw $45b
+	dw EVENT_BEAT_FISHER_STEPHEN
 
 	; trainer group && trainer id
 	db FISHER, STEPHEN
@@ -82,20 +77,18 @@ TrainerFisherStephen: ; 0x1a6fdd
 
 	; script when talk again
 	dw FisherStephenScript
-; 0x1a6fe9
 
-FisherStephenScript: ; 0x1a6fe9
+FisherStephenScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1a70d4
 	closetext
 	loadmovesprites
 	end
-; 0x1a6ff1
 
-TrainerFisherBarney: ; 0x1a6ff1
+TrainerFisherBarney:
 	; bit/flag number
-	dw $45c
+	dw EVENT_BEAT_FISHER_BARNEY
 
 	; trainer group && trainer id
 	db FISHER, BARNEY
@@ -111,94 +104,79 @@ TrainerFisherBarney: ; 0x1a6ff1
 
 	; script when talk again
 	dw FisherBarneyScript
-; 0x1a6ffd
 
-FisherBarneyScript: ; 0x1a6ffd
+FisherBarneyScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x1a716d
 	closetext
 	loadmovesprites
 	end
-; 0x1a7005
 
-MapRoute12Signpost0Script: ; 0x1a7005
+MapRoute12Signpost0Script:
 	jumptext UnknownText_0x1a72a0
-; 0x1a7008
 
-MapRoute12Signpost1Script: ; 0x1a7008
+MapRoute12Signpost1Script:
 	jumptext UnknownText_0x1a72c1
-; 0x1a700b
 
-ItemFragment_0x1a700b: ; 0x1a700b
+ItemFragment_0x1a700b:
 	db CALCIUM, 1
-; 0x1a700d
 
-ItemFragment_0x1a700d: ; 0x1a700d
+ItemFragment_0x1a700d:
 	db NUGGET, 1
-; 0x1a700f
 
-MapRoute12SignpostItem2: ; 0x1a700f
+MapRoute12SignpostItem2:
 	dw $00f3
 	db ELIXER
 	
-; 0x1a7012
 
-FisherMartinSeenText: ; 0x1a7012
+FisherMartinSeenText:
 	text "Patience is the"
 	line "key to both fish-"
 	cont "ing and #MON."
 	done
-; 0x1a7043
 
-FisherMartinBeatenText: ; 0x1a7043
+FisherMartinBeatenText:
 	text "Gwaaah!"
 	done
-; 0x1a704c
 
-UnknownText_0x1a704c: ; 0x1a704c
+UnknownText_0x1a704c:
 	text "I'm too impatient"
 	line "for fishing…"
 	done
-; 0x1a706b
 
-FisherStephenSeenText: ; 0x1a706b
+FisherStephenSeenText:
 	text "I feel so content,"
 	line "fishing while lis-"
 	cont "tening to some"
 	cont "tunes on my radio."
 	done
-; 0x1a70b4
 
-FisherStephenBeatenText: ; 0x1a70b4
+FisherStephenBeatenText:
 	text "My stupid radio"
 	line "distracted me!"
 	done
-; 0x1a70d4
 
-UnknownText_0x1a70d4: ; 0x1a70d4
+UnknownText_0x1a70d4:
 	text "Have you checked"
 	line "out KANTO's radio"
 
 	para "programs? We get a"
 	line "good variety here."
 	done
-; 0x1a711d
 
-FisherBarneySeenText: ; 0x1a711d
+FisherBarneySeenText:
 	text "What's most impor-"
 	line "tant in our every-"
 	cont "day lives?"
 	done
-; 0x1a714e
 
-FisherBarneyBeatenText: ; 0x1a714e
+FisherBarneyBeatenText:
 	text "The answer is"
 	line "coming up next!"
 	done
-; 0x1a716d
 
-UnknownText_0x1a716d: ; 0x1a716d
+UnknownText_0x1a716d:
 	text "I think electric-"
 	line "ity is the most"
 
@@ -214,19 +192,16 @@ UnknownText_0x1a716d: ; 0x1a716d
 	para "POWER PLANT went"
 	line "out of commission."
 	done
-; 0x1a7214
 
-FisherKyleSeenText: ; 0x1a7214
+FisherKyleSeenText:
 	text "Do you remember?"
 	done
-; 0x1a7226
 
-FisherKyleBeatenText: ; 0x1a7226
+FisherKyleBeatenText:
 	text "You do remember?"
 	done
-; 0x1a7238
 
-UnknownText_0x1a7238: ; 0x1a7238
+UnknownText_0x1a7238:
 	text "The tug you feel"
 	line "on the ROD when"
 
@@ -237,22 +212,19 @@ UnknownText_0x1a7238: ; 0x1a7238
 	line "feeling ever for"
 	cont "an angler like me."
 	done
-; 0x1a72a0
 
-UnknownText_0x1a72a0: ; 0x1a72a0
+UnknownText_0x1a72a0:
 	text "ROUTE 12"
 
 	para "NORTH TO LAVENDER"
 	line "TOWN"
 	done
-; 0x1a72c1
 
-UnknownText_0x1a72c1: ; 0x1a72c1
+UnknownText_0x1a72c1:
 	text "FISHING SPOT"
 	done
-; 0x1a72cf
 
-Route12_MapEventHeader: ; 0x1a72cf
+Route12_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -277,4 +249,3 @@ Route12_MapEventHeader: ; 0x1a72cf
 	person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, $ffff
 	person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788
 	person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789
-; 0x1a7337