Fill out trainer event flags.
This commit is contained in:
117
maps/Route15.asm
117
maps/Route15.asm
@@ -1,14 +1,13 @@
|
||||
Route15_MapScriptHeader: ; 0x1aa567
|
||||
Route15_MapScriptHeader:
|
||||
; trigger count
|
||||
db 0
|
||||
|
||||
; callback count
|
||||
db 0
|
||||
; 0x1aa569
|
||||
|
||||
TrainerTeacherColette: ; 0x1aa569
|
||||
TrainerTeacherColette:
|
||||
; bit/flag number
|
||||
dw $5b5
|
||||
dw EVENT_BEAT_TEACHER_COLETTE
|
||||
|
||||
; trainer group && trainer id
|
||||
db TEACHER, COLETTE
|
||||
@@ -24,20 +23,18 @@ TrainerTeacherColette: ; 0x1aa569
|
||||
|
||||
; script when talk again
|
||||
dw TeacherColetteScript
|
||||
; 0x1aa575
|
||||
|
||||
TeacherColetteScript: ; 0x1aa575
|
||||
TeacherColetteScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa60d
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa57d
|
||||
|
||||
TrainerTeacherHillary: ; 0x1aa57d
|
||||
TrainerTeacherHillary:
|
||||
; bit/flag number
|
||||
dw $5b6
|
||||
dw EVENT_BEAT_TEACHER_HILLARY
|
||||
|
||||
; trainer group && trainer id
|
||||
db TEACHER, HILLARY
|
||||
@@ -53,20 +50,18 @@ TrainerTeacherHillary: ; 0x1aa57d
|
||||
|
||||
; script when talk again
|
||||
dw TeacherHillaryScript
|
||||
; 0x1aa589
|
||||
|
||||
TeacherHillaryScript: ; 0x1aa589
|
||||
TeacherHillaryScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa6ca
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa591
|
||||
|
||||
TrainerSchoolboyKipp: ; 0x1aa591
|
||||
TrainerSchoolboyKipp:
|
||||
; bit/flag number
|
||||
dw $46d
|
||||
dw EVENT_BEAT_SCHOOLBOY_KIP
|
||||
|
||||
; trainer group && trainer id
|
||||
db SCHOOLBOY, KIPP
|
||||
@@ -82,20 +77,18 @@ TrainerSchoolboyKipp: ; 0x1aa591
|
||||
|
||||
; script when talk again
|
||||
dw SchoolboyKippScript
|
||||
; 0x1aa59d
|
||||
|
||||
SchoolboyKippScript: ; 0x1aa59d
|
||||
SchoolboyKippScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa740
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa5a5
|
||||
|
||||
TrainerSchoolboyTommy: ; 0x1aa5a5
|
||||
TrainerSchoolboyTommy:
|
||||
; bit/flag number
|
||||
dw $471
|
||||
dw EVENT_BEAT_SCHOOLBOY_TOMMY
|
||||
|
||||
; trainer group && trainer id
|
||||
db SCHOOLBOY, TOMMY
|
||||
@@ -111,20 +104,18 @@ TrainerSchoolboyTommy: ; 0x1aa5a5
|
||||
|
||||
; script when talk again
|
||||
dw SchoolboyTommyScript
|
||||
; 0x1aa5b1
|
||||
|
||||
SchoolboyTommyScript: ; 0x1aa5b1
|
||||
SchoolboyTommyScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa7bc
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa5b9
|
||||
|
||||
TrainerSchoolboyJohnny: ; 0x1aa5b9
|
||||
TrainerSchoolboyJohnny:
|
||||
; bit/flag number
|
||||
dw $46f
|
||||
dw EVENT_BEAT_SCHOOLBOY_JOHNNY
|
||||
|
||||
; trainer group && trainer id
|
||||
db SCHOOLBOY, JOHNNY
|
||||
@@ -140,20 +131,18 @@ TrainerSchoolboyJohnny: ; 0x1aa5b9
|
||||
|
||||
; script when talk again
|
||||
dw SchoolboyJohnnyScript
|
||||
; 0x1aa5c5
|
||||
|
||||
SchoolboyJohnnyScript: ; 0x1aa5c5
|
||||
SchoolboyJohnnyScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa84a
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa5cd
|
||||
|
||||
TrainerSchoolboyBilly: ; 0x1aa5cd
|
||||
TrainerSchoolboyBilly:
|
||||
; bit/flag number
|
||||
dw $474
|
||||
dw EVENT_BEAT_SCHOOLBOY_BILLY
|
||||
|
||||
; trainer group && trainer id
|
||||
db SCHOOLBOY, BILLY
|
||||
@@ -169,46 +158,39 @@ TrainerSchoolboyBilly: ; 0x1aa5cd
|
||||
|
||||
; script when talk again
|
||||
dw SchoolboyBillyScript
|
||||
; 0x1aa5d9
|
||||
|
||||
SchoolboyBillyScript: ; 0x1aa5d9
|
||||
SchoolboyBillyScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x1aa8b0
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x1aa5e1
|
||||
|
||||
MapRoute15Signpost0Script: ; 0x1aa5e1
|
||||
MapRoute15Signpost0Script:
|
||||
jumptext UnknownText_0x1aa8e3
|
||||
; 0x1aa5e4
|
||||
|
||||
ItemFragment_0x1aa5e4: ; 0x1aa5e4
|
||||
ItemFragment_0x1aa5e4:
|
||||
db PP_UP, 1
|
||||
; 0x1aa5e6
|
||||
|
||||
TeacherColetteSeenText: ; 0x1aa5e6
|
||||
TeacherColetteSeenText:
|
||||
text "Have you forgotten"
|
||||
line "anything?"
|
||||
done
|
||||
; 0x1aa604
|
||||
|
||||
TeacherColetteBeatenText: ; 0x1aa604
|
||||
TeacherColetteBeatenText:
|
||||
text "Kyaaah!"
|
||||
done
|
||||
; 0x1aa60d
|
||||
|
||||
UnknownText_0x1aa60d: ; 0x1aa60d
|
||||
UnknownText_0x1aa60d:
|
||||
text "Before I became a"
|
||||
line "teacher, I used to"
|
||||
|
||||
para "forget a lot of"
|
||||
line "things."
|
||||
done
|
||||
; 0x1aa64b
|
||||
|
||||
TeacherHillarySeenText: ; 0x1aa64b
|
||||
TeacherHillarySeenText:
|
||||
text "On sunny days, I"
|
||||
line "think that the"
|
||||
|
||||
@@ -218,111 +200,95 @@ TeacherHillarySeenText: ; 0x1aa64b
|
||||
para "schoolyard than"
|
||||
line "studying in class."
|
||||
done
|
||||
; 0x1aa6b3
|
||||
|
||||
TeacherHillaryBeatenText: ; 0x1aa6b3
|
||||
TeacherHillaryBeatenText:
|
||||
text "I didn't want to"
|
||||
line "lose…"
|
||||
done
|
||||
; 0x1aa6ca
|
||||
|
||||
UnknownText_0x1aa6ca: ; 0x1aa6ca
|
||||
UnknownText_0x1aa6ca:
|
||||
text "Studying is impor-"
|
||||
line "tant, but exercise"
|
||||
cont "is just as vital."
|
||||
done
|
||||
; 0x1aa703
|
||||
|
||||
SchoolboyKippSeenText: ; 0x1aa703
|
||||
SchoolboyKippSeenText:
|
||||
text "Hang on. I have to"
|
||||
line "phone my mom."
|
||||
done
|
||||
; 0x1aa725
|
||||
|
||||
SchoolboyKippBeatenText: ; 0x1aa725
|
||||
SchoolboyKippBeatenText:
|
||||
text "Sorry, Mom!"
|
||||
line "I was beaten!"
|
||||
done
|
||||
; 0x1aa740
|
||||
|
||||
UnknownText_0x1aa740: ; 0x1aa740
|
||||
UnknownText_0x1aa740:
|
||||
text "My mom worries so"
|
||||
line "much about me, I"
|
||||
|
||||
para "have to phone her"
|
||||
line "all the time."
|
||||
done
|
||||
; 0x1aa784
|
||||
|
||||
SchoolboyTommySeenText: ; 0x1aa784
|
||||
SchoolboyTommySeenText:
|
||||
text "Let's battle."
|
||||
line "I won't lose!"
|
||||
done
|
||||
; 0x1aa79f
|
||||
|
||||
SchoolboyTommyBeatenText: ; 0x1aa79f
|
||||
SchoolboyTommyBeatenText:
|
||||
text "I forgot to do my"
|
||||
line "homework!"
|
||||
done
|
||||
; 0x1aa7bc
|
||||
|
||||
UnknownText_0x1aa7bc: ; 0x1aa7bc
|
||||
UnknownText_0x1aa7bc:
|
||||
text "Sayonara! I just"
|
||||
line "learned that in my"
|
||||
cont "Japanese class."
|
||||
done
|
||||
; 0x1aa7f1
|
||||
|
||||
SchoolboyJohnnySeenText: ; 0x1aa7f1
|
||||
SchoolboyJohnnySeenText:
|
||||
text "We're on a field"
|
||||
line "trip to LAVENDER"
|
||||
|
||||
para "RADIO TOWER for"
|
||||
line "social studies."
|
||||
done
|
||||
; 0x1aa833
|
||||
|
||||
SchoolboyJohnnyBeatenText: ; 0x1aa833
|
||||
SchoolboyJohnnyBeatenText:
|
||||
text "You're wickedly"
|
||||
line "tough!"
|
||||
done
|
||||
; 0x1aa84a
|
||||
|
||||
UnknownText_0x1aa84a: ; 0x1aa84a
|
||||
UnknownText_0x1aa84a:
|
||||
text "I'm tired of walk-"
|
||||
line "ing. I need to"
|
||||
cont "take a break."
|
||||
done
|
||||
; 0x1aa87a
|
||||
|
||||
SchoolboyBillySeenText: ; 0x1aa87a
|
||||
SchoolboyBillySeenText:
|
||||
text "My favorite class"
|
||||
line "is gym!"
|
||||
done
|
||||
; 0x1aa895
|
||||
|
||||
SchoolboyBillyBeatenText: ; 0x1aa895
|
||||
SchoolboyBillyBeatenText:
|
||||
text "Oh, no!"
|
||||
line "How could I lose?"
|
||||
done
|
||||
; 0x1aa8b0
|
||||
|
||||
UnknownText_0x1aa8b0: ; 0x1aa8b0
|
||||
UnknownText_0x1aa8b0:
|
||||
text "If #MON were a"
|
||||
line "subject at school,"
|
||||
cont "I'd be the best!"
|
||||
done
|
||||
; 0x1aa8e3
|
||||
|
||||
UnknownText_0x1aa8e3: ; 0x1aa8e3
|
||||
UnknownText_0x1aa8e3:
|
||||
text "ROUTE 15"
|
||||
|
||||
para "FUCHSIA CITY -"
|
||||
line "LAVENDER TOWN"
|
||||
done
|
||||
; 0x1aa90a
|
||||
|
||||
Route15_MapEventHeader: ; 0x1aa90a
|
||||
Route15_MapEventHeader:
|
||||
; filler
|
||||
db 0, 0
|
||||
|
||||
@@ -347,4 +313,3 @@ Route15_MapEventHeader: ; 0x1aa90a
|
||||
person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff
|
||||
person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff
|
||||
person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a
|
||||
; 0x1aa97a
|
||||
|
Reference in New Issue
Block a user