Fill out trainer event flags.

maps/Route11.asm

@@ -1,14 +1,13 @@
-Route11_MapScriptHeader: ; 0x68000
+Route11_MapScriptHeader:
 	; trigger count
 	db 0
 
 	; callback count
 	db 0
-; 0x68002
 
-TrainerYoungsterOwen: ; 0x68002
+TrainerYoungsterOwen:
 	; bit/flag number
-	dw $5b3
+	dw EVENT_BEAT_YOUNGSTER_OWEN
 
 	; trainer group && trainer id
 	db YOUNGSTER, OWEN
@@ -24,20 +23,18 @@ TrainerYoungsterOwen: ; 0x68002
 
 	; script when talk again
 	dw YoungsterOwenScript
-; 0x6800e
 
-YoungsterOwenScript: ; 0x6800e
+YoungsterOwenScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x680b2
 	closetext
 	loadmovesprites
 	end
-; 0x68016
 
-TrainerYoungsterJason: ; 0x68016
+TrainerYoungsterJason:
 	; bit/flag number
-	dw $5b4
+	dw EVENT_BEAT_YOUNGSTER_JASON
 
 	; trainer group && trainer id
 	db YOUNGSTER, JASON
@@ -53,20 +50,18 @@ TrainerYoungsterJason: ; 0x68016
 
 	; script when talk again
 	dw YoungsterJasonScript
-; 0x68022
 
-YoungsterJasonScript: ; 0x68022
+YoungsterJasonScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x6814a
 	closetext
 	loadmovesprites
 	end
-; 0x6802a
 
-TrainerPsychicHerman: ; 0x6802a
+TrainerPsychicHerman:
 	; bit/flag number
-	dw $43c
+	dw EVENT_BEAT_PSYCHIC_HERMAN
 
 	; trainer group && trainer id
 	db PSYCHIC_T, HERMAN
@@ -82,20 +77,18 @@ TrainerPsychicHerman: ; 0x6802a
 
 	; script when talk again
 	dw PsychicHermanScript
-; 0x68036
 
-PsychicHermanScript: ; 0x68036
+PsychicHermanScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x6817b
 	closetext
 	loadmovesprites
 	end
-; 0x6803e
 
-TrainerPsychicFidel: ; 0x6803e
+TrainerPsychicFidel:
 	; bit/flag number
-	dw $43d
+	dw EVENT_BEAT_PSYCHIC_FIDEL
 
 	; trainer group && trainer id
 	db PSYCHIC_T, FIDEL
@@ -111,110 +104,94 @@ TrainerPsychicFidel: ; 0x6803e
 
 	; script when talk again
 	dw PsychicFidelScript
-; 0x6804a
 
-PsychicFidelScript: ; 0x6804a
+PsychicFidelScript:
 	talkaftercancel
 	loadfont
 	writetext UnknownText_0x681ec
 	closetext
 	loadmovesprites
 	end
-; 0x68052
 
-MapRoute11Signpost0Script: ; 0x68052
+MapRoute11Signpost0Script:
 	jumptext UnknownText_0x68238
-; 0x68055
 
-FruitTreeScript_0x68055: ; 0x68055
+FruitTreeScript_0x68055:
 	fruittree $18
-; 0x68057
 
-MapRoute11SignpostItem1: ; 0x68057
+MapRoute11SignpostItem1:
 	dw $00f5
 	db REVIVE
 	
-; 0x6805a
 
-YoungsterOwenSeenText: ; 0x6805a
+YoungsterOwenSeenText:
 	text "There's no cheat-"
 	line "ing in #MON."
 
 	para "Let's keep it fair"
 	line "and square!"
 	done
-; 0x68097
 
-YoungsterOwenBeatenText: ; 0x68097
+YoungsterOwenBeatenText:
 	text "Huh? How did this"
 	line "happen?"
 	done
-; 0x680b2
 
-UnknownText_0x680b2: ; 0x680b2
+UnknownText_0x680b2:
 	text "I fought fair and"
 	line "square with honor."
 
 	para "I don't regret"
 	line "this at all."
 	done
-; 0x680f3
 
-YoungsterJasonSeenText: ; 0x680f3
+YoungsterJasonSeenText:
 	text "It itches and"
 	line "tickles a bit when"
 
 	para "I wear shorts in"
 	line "the grass."
 	done
-; 0x68131
 
-YoungsterJasonBeatenText: ; 0x68131
+YoungsterJasonBeatenText:
 	text "Aiyaaah!"
 	line "I got stomped!"
 	done
-; 0x6814a
 
-UnknownText_0x6814a: ; 0x6814a
+UnknownText_0x6814a:
 	text "I'm going to catch"
 	line "more #MON in"
 	cont "the grass."
 	done
-; 0x68175
 
-PsychicHermanSeenText: ; 0x68175
+PsychicHermanSeenText:
 	text "…"
 	done
-; 0x68178
 
-PsychicHermanBeatenText: ; 0x68178
+PsychicHermanBeatenText:
 	text "…"
 	done
-; 0x6817b
 
-UnknownText_0x6817b: ; 0x6817b
+UnknownText_0x6817b:
 	text "…"
 
 	para "I lost while I had"
 	line "my eyes closed…"
 	done
-; 0x681a1
 
-PsychicFidelSeenText: ; 0x681a1
+PsychicFidelSeenText:
 	text "I can see it…"
 
 	para "Everything to see"
 	line "about you…"
 	done
-; 0x681cd
 
-PsychicFidelBeatenText: ; 0x681cd
+PsychicFidelBeatenText:
 	text "I couldn't foresee"
 	line "your power…"
 	done
-; 0x681ec
 
-UnknownText_0x681ec: ; 0x681ec
+UnknownText_0x681ec:
 	text "Strength in con-"
 	line "viction…"
 
@@ -222,14 +199,12 @@ UnknownText_0x681ec: ; 0x681ec
 	line "cause you believe"
 	cont "in your #MON."
 	done
-; 0x68238
 
-UnknownText_0x68238: ; 0x68238
+UnknownText_0x68238:
 	text "ROUTE 11"
 	done
-; 0x68242
 
-Route11_MapEventHeader: ; 0x68242
+Route11_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -251,4 +226,3 @@ Route11_MapEventHeader: ; 0x68242
 	person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff
 	person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff
 	person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff
-; 0x68293