Trainer data structure and field move functions

Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
This commit is contained in:
PikalaxALT
2015-07-18 23:45:39 -04:00
parent e674869018
commit 60cd04b023
116 changed files with 2148 additions and 8705 deletions

View File

@@ -61,23 +61,7 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
; bit/flag number
dw EVENT_BEAT_TWINS_AMY_AND_MAY
; trainer group && trainer id
db TWINS, AMYANDMAY1
; text when seen
dw TwinsAmyandmay1SeenText
; text when trainer beaten
dw TwinsAmyandmay1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsAmyandmay1Script
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, TwinsAmyandmay1Script
TwinsAmyandmay1Script:
talkaftercancel
@@ -88,23 +72,7 @@ TwinsAmyandmay1Script:
end
TrainerTwinsAmyandmay2:
; bit/flag number
dw EVENT_BEAT_TWINS_AMY_AND_MAY
; trainer group && trainer id
db TWINS, AMYANDMAY2
; text when seen
dw TwinsAmyandmay2SeenText
; text when trainer beaten
dw TwinsAmyandmay2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsAmyandmay2Script
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, TwinsAmyandmay2Script
TwinsAmyandmay2Script:
talkaftercancel
@@ -115,23 +83,7 @@ TwinsAmyandmay2Script:
end
TrainerBug_catcherBug_catcher_benny:
; bit/flag number
dw EVENT_BEAT_BUG_CATCHER_BENNY
; trainer group && trainer id
db BUG_CATCHER, BUG_CATCHER_BENNY
; text when seen
dw Bug_catcherBug_catcher_bennySeenText
; text when trainer beaten
dw Bug_catcherBug_catcher_bennyBeatenText
; script when lost
dw $0000
; script when talk again
dw Bug_catcherBug_catcher_bennyScript
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, Bug_catcherBug_catcher_bennyScript
Bug_catcherBug_catcher_bennyScript:
talkaftercancel
@@ -142,23 +94,7 @@ Bug_catcherBug_catcher_bennyScript:
end
TrainerBug_catcherAl:
; bit/flag number
dw EVENT_BEAT_BUG_CATCHER_AL
; trainer group && trainer id
db BUG_CATCHER, AL
; text when seen
dw Bug_catcherAlSeenText
; text when trainer beaten
dw Bug_catcherAlBeatenText
; script when lost
dw $0000
; script when talk again
dw Bug_catcherAlScript
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, Bug_catcherAlScript
Bug_catcherAlScript:
talkaftercancel
@@ -169,23 +105,7 @@ Bug_catcherAlScript:
end
TrainerBug_catcherJosh:
; bit/flag number
dw EVENT_BEAT_BUG_CATCHER_JOSH
; trainer group && trainer id
db BUG_CATCHER, JOSH
; text when seen
dw Bug_catcherJoshSeenText
; text when trainer beaten
dw Bug_catcherJoshBeatenText
; script when lost
dw $0000
; script when talk again
dw Bug_catcherJoshScript
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, Bug_catcherJoshScript
Bug_catcherJoshScript:
talkaftercancel

View File

@@ -87,23 +87,7 @@ UnknownScript_0x194e94:
end
TrainerCooltrainermPaul:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_PAUL
; trainer group && trainer id
db COOLTRAINERM, PAUL
; text when seen
dw CooltrainermPaulSeenText
; text when trainer beaten
dw CooltrainermPaulBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermPaulScript
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, $0000, CooltrainermPaulScript
CooltrainermPaulScript:
talkaftercancel
@@ -114,23 +98,7 @@ CooltrainermPaulScript:
end
TrainerCooltrainermMike:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_MIKE
; trainer group && trainer id
db COOLTRAINERM, MIKE
; text when seen
dw CooltrainermMikeSeenText
; text when trainer beaten
dw CooltrainermMikeBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermMikeScript
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, $0000, CooltrainermMikeScript
CooltrainermMikeScript:
talkaftercancel
@@ -141,23 +109,7 @@ CooltrainermMikeScript:
end
TrainerCooltrainerfLola:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_LOLA
; trainer group && trainer id
db COOLTRAINERF, LOLA
; text when seen
dw CooltrainerfLolaSeenText
; text when trainer beaten
dw CooltrainerfLolaBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfLolaScript
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, $0000, CooltrainerfLolaScript
CooltrainerfLolaScript:
talkaftercancel

View File

@@ -59,23 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_CODY
; trainer group && trainer id
db COOLTRAINERM, CODY
; text when seen
dw CooltrainermCodySeenText
; text when trainer beaten
dw CooltrainermCodyBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermCodyScript
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript
CooltrainermCodyScript:
talkaftercancel
@@ -86,23 +70,7 @@ CooltrainermCodyScript:
end
TrainerCooltrainerfFran:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_FRAN
; trainer group && trainer id
db COOLTRAINERF, FRAN
; text when seen
dw CooltrainerfFranSeenText
; text when trainer beaten
dw CooltrainerfFranBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfFranScript
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel

View File

@@ -42,23 +42,7 @@ UnknownScript_0x72aae:
end
TrainerLassMichelle:
; bit/flag number
dw EVENT_BEAT_LASS_MICHELLE
; trainer group && trainer id
db LASS, MICHELLE
; text when seen
dw LassMichelleSeenText
; text when trainer beaten
dw LassMichelleBeatenText
; script when lost
dw $0000
; script when talk again
dw LassMichelleScript
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript
LassMichelleScript:
talkaftercancel
@@ -69,23 +53,7 @@ LassMichelleScript:
end
TrainerPicnickerTanya:
; bit/flag number
dw EVENT_BEAT_PICNICKER_TANYA
; trainer group && trainer id
db PICNICKER, TANYA
; text when seen
dw PicnickerTanyaSeenText
; text when trainer beaten
dw PicnickerTanyaBeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerTanyaScript
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript
PicnickerTanyaScript:
talkaftercancel
@@ -96,23 +64,7 @@ PicnickerTanyaScript:
end
TrainerBeautyJulia:
; bit/flag number
dw EVENT_BEAT_BEAUTY_JULIA
; trainer group && trainer id
db BEAUTY, JULIA
; text when seen
dw BeautyJuliaSeenText
; text when trainer beaten
dw BeautyJuliaBeatenText
; script when lost
dw $0000
; script when talk again
dw BeautyJuliaScript
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript
BeautyJuliaScript:
talkaftercancel
@@ -123,23 +75,7 @@ BeautyJuliaScript:
end
TrainerTwinsJoandzoe1:
; bit/flag number
dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE1
; text when seen
dw TwinsJoandzoe1SeenText
; text when trainer beaten
dw TwinsJoandzoe1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsJoandzoe1Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script
TwinsJoandzoe1Script:
talkaftercancel
@@ -150,23 +86,7 @@ TwinsJoandzoe1Script:
end
TrainerTwinsJoandzoe2:
; bit/flag number
dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE2
; text when seen
dw TwinsJoandzoe2SeenText
; text when trainer beaten
dw TwinsJoandzoe2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsJoandzoe2Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script
TwinsJoandzoe2Script:
talkaftercancel

View File

@@ -80,23 +80,7 @@ MistyScript_0x188432:
end
TrainerSwimmerfDiana:
; bit/flag number
dw EVENT_BEAT_SWIMMERF_DIANA
; trainer group && trainer id
db SWIMMERF, DIANA
; text when seen
dw SwimmerfDianaSeenText
; text when trainer beaten
dw SwimmerfDianaBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmerfDianaScript
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, $0000, SwimmerfDianaScript
SwimmerfDianaScript:
talkaftercancel
@@ -107,23 +91,7 @@ SwimmerfDianaScript:
end
TrainerSwimmerfBriana:
; bit/flag number
dw EVENT_BEAT_SWIMMERF_BRIANA
; trainer group && trainer id
db SWIMMERF, BRIANA
; text when seen
dw SwimmerfBrianaSeenText
; text when trainer beaten
dw SwimmerfBrianaBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmerfBrianaScript
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, $0000, SwimmerfBrianaScript
SwimmerfBrianaScript:
talkaftercancel
@@ -134,23 +102,7 @@ SwimmerfBrianaScript:
end
TrainerSwimmermParker:
; bit/flag number
dw EVENT_BEAT_SWIMMERM_PARKER
; trainer group && trainer id
db SWIMMERM, PARKER
; text when seen
dw SwimmermParkerSeenText
; text when trainer beaten
dw SwimmermParkerBeatenText
; script when lost
dw $0000
; script when talk again
dw SwimmermParkerScript
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, $0000, SwimmermParkerScript
SwimmermParkerScript:
talkaftercancel

View File

@@ -76,23 +76,7 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBlackbeltYoshi:
; bit/flag number
dw EVENT_BEAT_BLACKBELT_YOSHI
; trainer group && trainer id
db BLACKBELT_T, YOSHI
; text when seen
dw BlackbeltYoshiSeenText
; text when trainer beaten
dw BlackbeltYoshiBeatenText
; script when lost
dw $0000
; script when talk again
dw BlackbeltYoshiScript
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, $0000, BlackbeltYoshiScript
BlackbeltYoshiScript:
talkaftercancel
@@ -103,23 +87,7 @@ BlackbeltYoshiScript:
end
TrainerBlackbeltLao:
; bit/flag number
dw EVENT_BEAT_BLACKBELT_LAO
; trainer group && trainer id
db BLACKBELT_T, LAO
; text when seen
dw BlackbeltLaoSeenText
; text when trainer beaten
dw BlackbeltLaoBeatenText
; script when lost
dw $0000
; script when talk again
dw BlackbeltLaoScript
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, $0000, BlackbeltLaoScript
BlackbeltLaoScript:
talkaftercancel
@@ -130,23 +98,7 @@ BlackbeltLaoScript:
end
TrainerBlackbeltNob:
; bit/flag number
dw EVENT_BEAT_BLACKBELT_NOB
; trainer group && trainer id
db BLACKBELT_T, NOB
; text when seen
dw BlackbeltNobSeenText
; text when trainer beaten
dw BlackbeltNobBeatenText
; script when lost
dw $0000
; script when talk again
dw BlackbeltNobScript
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, $0000, BlackbeltNobScript
BlackbeltNobScript:
talkaftercancel
@@ -157,23 +109,7 @@ BlackbeltNobScript:
end
TrainerBlackbeltLung:
; bit/flag number
dw EVENT_BEAT_BLACKBELT_LUNG
; trainer group && trainer id
db BLACKBELT_T, LUNG
; text when seen
dw BlackbeltLungSeenText
; text when trainer beaten
dw BlackbeltLungBeatenText
; script when lost
dw $0000
; script when talk again
dw BlackbeltLungScript
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, $0000, BlackbeltLungScript
BlackbeltLungScript:
talkaftercancel

View File

@@ -6,23 +6,7 @@ DanceTheatre_MapScriptHeader:
db 0
TrainerKimono_girlNaoko2:
; bit/flag number
dw EVENT_BEAT_KIMONO_GIRL_NAOKO
; trainer group && trainer id
db KIMONO_GIRL, NAOKO2
; text when seen
dw Kimono_girlNaoko2SeenText
; text when trainer beaten
dw Kimono_girlNaoko2BeatenText
; script when lost
dw $0000
; script when talk again
dw Kimono_girlNaoko2Script
trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, $0000, Kimono_girlNaoko2Script
Kimono_girlNaoko2Script:
talkaftercancel
@@ -33,23 +17,7 @@ Kimono_girlNaoko2Script:
end
TrainerKimono_girlSayo:
; bit/flag number
dw EVENT_BEAT_KIMONO_GIRL_SAYO
; trainer group && trainer id
db KIMONO_GIRL, SAYO
; text when seen
dw Kimono_girlSayoSeenText
; text when trainer beaten
dw Kimono_girlSayoBeatenText
; script when lost
dw $0000
; script when talk again
dw Kimono_girlSayoScript
trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, $0000, Kimono_girlSayoScript
Kimono_girlSayoScript:
talkaftercancel
@@ -60,23 +28,7 @@ Kimono_girlSayoScript:
end
TrainerKimono_girlZuki:
; bit/flag number
dw EVENT_BEAT_KIMONO_GIRL_ZUKI
; trainer group && trainer id
db KIMONO_GIRL, ZUKI
; text when seen
dw Kimono_girlZukiSeenText
; text when trainer beaten
dw Kimono_girlZukiBeatenText
; script when lost
dw $0000
; script when talk again
dw Kimono_girlZukiScript
trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, $0000, Kimono_girlZukiScript
Kimono_girlZukiScript:
talkaftercancel
@@ -87,23 +39,7 @@ Kimono_girlZukiScript:
end
TrainerKimono_girlKuni:
; bit/flag number
dw EVENT_BEAT_KIMONO_GIRL_KUNI
; trainer group && trainer id
db KIMONO_GIRL, KUNI
; text when seen
dw Kimono_girlKuniSeenText
; text when trainer beaten
dw Kimono_girlKuniBeatenText
; script when lost
dw $0000
; script when talk again
dw Kimono_girlKuniScript
trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, $0000, Kimono_girlKuniScript
Kimono_girlKuniScript:
talkaftercancel
@@ -114,23 +50,7 @@ Kimono_girlKuniScript:
end
TrainerKimono_girlMiki:
; bit/flag number
dw EVENT_BEAT_KIMONO_GIRL_MIKI
; trainer group && trainer id
db KIMONO_GIRL, MIKI
; text when seen
dw Kimono_girlMikiSeenText
; text when trainer beaten
dw Kimono_girlMikiBeatenText
; script when lost
dw $0000
; script when talk again
dw Kimono_girlMikiScript
trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, $0000, Kimono_girlMikiScript
Kimono_girlMikiScript:
talkaftercancel

View File

@@ -78,23 +78,7 @@ UnknownScript_0x18c8f9:
end
TrainerCooltrainermDarin:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_DARIN
; trainer group && trainer id
db COOLTRAINERM, DARIN
; text when seen
dw CooltrainermDarinSeenText
; text when trainer beaten
dw CooltrainermDarinBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermDarinScript
trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, $0000, CooltrainermDarinScript
CooltrainermDarinScript:
talkaftercancel
@@ -105,23 +89,7 @@ CooltrainermDarinScript:
end
TrainerCooltrainerfCara:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_CARA
; trainer group && trainer id
db COOLTRAINERF, CARA
; text when seen
dw CooltrainerfCaraSeenText
; text when trainer beaten
dw CooltrainerfCaraBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfCaraScript
trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, $0000, CooltrainerfCaraScript
CooltrainerfCaraScript:
talkaftercancel
@@ -132,23 +100,7 @@ CooltrainerfCaraScript:
end
TrainerTwinsLeaandpia1:
; bit/flag number
dw EVENT_BEAT_TWINS_LEA_AND_PIA
; trainer group && trainer id
db TWINS, LEAANDPIA1
; text when seen
dw TwinsLeaandpia1SeenText
; text when trainer beaten
dw TwinsLeaandpia1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsLeaandpia1Script
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, $0000, TwinsLeaandpia1Script
TwinsLeaandpia1Script:
talkaftercancel
@@ -159,23 +111,7 @@ TwinsLeaandpia1Script:
end
TrainerTwinsLeaandpia2:
; bit/flag number
dw EVENT_BEAT_TWINS_LEA_AND_PIA
; trainer group && trainer id
db TWINS, LEAANDPIA1
; text when seen
dw TwinsLeaandpia2SeenText
; text when trainer beaten
dw TwinsLeaandpia2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsLeaandpia2Script
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, $0000, TwinsLeaandpia2Script
TwinsLeaandpia2Script:
talkaftercancel

View File

@@ -91,23 +91,7 @@ UnknownScript_0x99dc6:
end
TrainerSageJeffrey:
; bit/flag number
dw EVENT_BEAT_SAGE_JEFFREY
; trainer group && trainer id
db SAGE, JEFFREY
; text when seen
dw SageJeffreySeenText
; text when trainer beaten
dw SageJeffreyBeatenText
; script when lost
dw $0000
; script when talk again
dw SageJeffreyScript
trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, $0000, SageJeffreyScript
SageJeffreyScript:
talkaftercancel
@@ -118,23 +102,7 @@ SageJeffreyScript:
end
TrainerSagePing:
; bit/flag number
dw EVENT_BEAT_SAGE_PING
; trainer group && trainer id
db SAGE, PING
; text when seen
dw SagePingSeenText
; text when trainer beaten
dw SagePingBeatenText
; script when lost
dw $0000
; script when talk again
dw SagePingScript
trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, $0000, SagePingScript
SagePingScript:
talkaftercancel
@@ -145,23 +113,7 @@ SagePingScript:
end
TrainerMediumMartha:
; bit/flag number
dw EVENT_BEAT_MEDIUM_MARTHA
; trainer group && trainer id
db MEDIUM, MARTHA
; text when seen
dw MediumMarthaSeenText
; text when trainer beaten
dw MediumMarthaBeatenText
; script when lost
dw $0000
; script when talk again
dw MediumMarthaScript
trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, $0000, MediumMarthaScript
MediumMarthaScript:
talkaftercancel
@@ -172,23 +124,7 @@ MediumMarthaScript:
end
TrainerMediumGrace:
; bit/flag number
dw EVENT_BEAT_MEDIUM_GRACE
; trainer group && trainer id
db MEDIUM, GRACE
; text when seen
dw MediumGraceSeenText
; text when trainer beaten
dw MediumGraceBeatenText
; script when lost
dw $0000
; script when talk again
dw MediumGraceScript
trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, $0000, MediumGraceScript
MediumGraceScript:
talkaftercancel

View File

@@ -252,7 +252,7 @@ ElmDirectionsScript:
writetext ElmDirectionsText1
closetext
loadmovesprites
addcellnum $4
addcellnum PHONE_ELM
loadfont
writetext GotElmsNumberText
playsound SFX_REGISTER_PHONE_NUMBER

View File

@@ -82,23 +82,7 @@ UnknownScript_0x767a0:
end
TrainerSailorJeff:
; bit/flag number
dw EVENT_BEAT_SAILOR_JEFF
; trainer group && trainer id
db SAILOR, JEFF
; text when seen
dw SailorJeffSeenText
; text when trainer beaten
dw SailorJeffBeatenText
; script when lost
dw $0000
; script when talk again
dw SailorJeffScript
trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, $0000, SailorJeffScript
SailorJeffScript:
talkaftercancel
@@ -109,23 +93,7 @@ SailorJeffScript:
end
TrainerPicnickerDebra:
; bit/flag number
dw EVENT_BEAT_PICNICKER_DEBRA
; trainer group && trainer id
db PICNICKER, DEBRA
; text when seen
dw PicnickerDebraSeenText
; text when trainer beaten
dw PicnickerDebraBeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerDebraScript
trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, $0000, PicnickerDebraScript
PicnickerDebraScript:
talkaftercancel
@@ -136,23 +104,7 @@ PicnickerDebraScript:
end
TrainerJugglerFritz:
; bit/flag number
dw EVENT_BEAT_JUGGLER_FRITZ
; trainer group && trainer id
db JUGGLER, FRITZ
; text when seen
dw JugglerFritzSeenText
; text when trainer beaten
dw JugglerFritzBeatenText
; script when lost
dw $0000
; script when talk again
dw JugglerFritzScript
trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, $0000, JugglerFritzScript
JugglerFritzScript:
talkaftercancel
@@ -163,23 +115,7 @@ JugglerFritzScript:
end
TrainerSailorGarrett:
; bit/flag number
dw EVENT_BEAT_SAILOR_GARRETT
; trainer group && trainer id
db SAILOR, GARRETT
; text when seen
dw SailorGarrettSeenText
; text when trainer beaten
dw SailorGarrettBeatenText
; script when lost
dw $0000
; script when talk again
dw SailorGarrettScript
trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, $0000, SailorGarrettScript
SailorGarrettScript:
talkaftercancel
@@ -190,23 +126,7 @@ SailorGarrettScript:
end
TrainerFisherJonah:
; bit/flag number
dw EVENT_BEAT_FISHER_JONAH
; trainer group && trainer id
db FISHER, JONAH
; text when seen
dw FisherJonahSeenText
; text when trainer beaten
dw FisherJonahBeatenText
; script when lost
dw $0000
; script when talk again
dw FisherJonahScript
trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, $0000, FisherJonahScript
FisherJonahScript:
talkaftercancel
@@ -217,23 +137,7 @@ FisherJonahScript:
end
TrainerBlackbeltWai:
; bit/flag number
dw EVENT_BEAT_BLACKBELT_WAI
; trainer group && trainer id
db BLACKBELT_T, WAI
; text when seen
dw BlackbeltWaiSeenText
; text when trainer beaten
dw BlackbeltWaiBeatenText
; script when lost
dw $0000
; script when talk again
dw BlackbeltWaiScript
trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, $0000, BlackbeltWaiScript
BlackbeltWaiScript:
talkaftercancel
@@ -244,23 +148,7 @@ BlackbeltWaiScript:
end
TrainerSailorKenneth:
; bit/flag number
dw EVENT_BEAT_SAILOR_KENNETH
; trainer group && trainer id
db SAILOR, KENNETH
; text when seen
dw SailorKennethSeenText
; text when trainer beaten
dw SailorKennethBeatenText
; script when lost
dw $0000
; script when talk again
dw SailorKennethScript
trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, $0000, SailorKennethScript
SailorKennethScript:
talkaftercancel
@@ -271,23 +159,7 @@ SailorKennethScript:
end
TrainerTeacherShirley:
; bit/flag number
dw EVENT_BEAT_TEACHER_SHIRLEY
; trainer group && trainer id
db TEACHER, SHIRLEY
; text when seen
dw TeacherShirleySeenText
; text when trainer beaten
dw TeacherShirleyBeatenText
; script when lost
dw $0000
; script when talk again
dw TeacherShirleyScript
trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, $0000, TeacherShirleyScript
TeacherShirleyScript:
talkaftercancel
@@ -298,23 +170,7 @@ TeacherShirleyScript:
end
TrainerSchoolboyNate:
; bit/flag number
dw EVENT_BEAT_SCHOOLBOY_NATE
; trainer group && trainer id
db SCHOOLBOY, NATE
; text when seen
dw SchoolboyNateSeenText
; text when trainer beaten
dw SchoolboyNateBeatenText
; script when lost
dw $0000
; script when talk again
dw SchoolboyNateScript
trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, $0000, SchoolboyNateScript
SchoolboyNateScript:
talkaftercancel
@@ -325,23 +181,7 @@ SchoolboyNateScript:
end
TrainerSchoolboyRicky:
; bit/flag number
dw EVENT_BEAT_SCHOOLBOY_RICKY
; trainer group && trainer id
db SCHOOLBOY, RICKY
; text when seen
dw SchoolboyRickySeenText
; text when trainer beaten
dw SchoolboyRickyBeatenText
; script when lost
dw $0000
; script when talk again
dw SchoolboyRickyScript
trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, $0000, SchoolboyRickyScript
SchoolboyRickyScript:
talkaftercancel

View File

@@ -6,23 +6,7 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader:
db 0
TrainerCooltrainermSean:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_SEAN
; trainer group && trainer id
db COOLTRAINERM, SEAN
; text when seen
dw CooltrainermSeanSeenText
; text when trainer beaten
dw CooltrainermSeanBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermSeanScript
trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, $0000, CooltrainermSeanScript
CooltrainermSeanScript:
talkaftercancel
@@ -33,23 +17,7 @@ CooltrainermSeanScript:
end
TrainerCooltrainerfCarol:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_CAROL
; trainer group && trainer id
db COOLTRAINERF, CAROL
; text when seen
dw CooltrainerfCarolSeenText
; text when trainer beaten
dw CooltrainerfCarolBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfCarolScript
trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, $0000, CooltrainerfCarolScript
CooltrainerfCarolScript:
talkaftercancel
@@ -60,23 +28,7 @@ CooltrainerfCarolScript:
end
TrainerPokemaniacEthan:
; bit/flag number
dw EVENT_BEAT_POKEMANIAC_ETHAN
; trainer group && trainer id
db POKEMANIAC, ETHAN
; text when seen
dw PokemaniacEthanSeenText
; text when trainer beaten
dw PokemaniacEthanBeatenText
; script when lost
dw $0000
; script when talk again
dw PokemaniacEthanScript
trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, $0000, PokemaniacEthanScript
PokemaniacEthanScript:
talkaftercancel
@@ -87,23 +39,7 @@ PokemaniacEthanScript:
end
TrainerHikerNoland:
; bit/flag number
dw EVENT_BEAT_HIKER_NOLAND
; trainer group && trainer id
db HIKER, NOLAND
; text when seen
dw HikerNolandSeenText
; text when trainer beaten
dw HikerNolandBeatenText
; script when lost
dw $0000
; script when talk again
dw HikerNolandScript
trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, $0000, HikerNolandScript
HikerNolandScript:
talkaftercancel
@@ -114,23 +50,7 @@ HikerNolandScript:
end
TrainerGentlemanEdward:
; bit/flag number
dw EVENT_BEAT_GENTLEMAN_EDWARD
; trainer group && trainer id
db GENTLEMAN, EDWARD
; text when seen
dw GentlemanEdwardSeenText
; text when trainer beaten
dw GentlemanEdwardBeatenText
; script when lost
dw $0000
; script when talk again
dw GentlemanEdwardScript
trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, $0000, GentlemanEdwardScript
GentlemanEdwardScript:
talkaftercancel
@@ -141,23 +61,7 @@ GentlemanEdwardScript:
end
TrainerBurglarCorey:
; bit/flag number
dw EVENT_BEAT_BURGLAR_COREY
; trainer group && trainer id
db BURGLAR, COREY
; text when seen
dw BurglarCoreySeenText
; text when trainer beaten
dw BurglarCoreyBeatenText
; script when lost
dw $0000
; script when talk again
dw BurglarCoreyScript
trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, $0000, BurglarCoreyScript
BurglarCoreyScript:
talkaftercancel

View File

@@ -128,23 +128,7 @@ TwinScript_0x75f6d:
end
TrainerPokefanmColin:
; bit/flag number
dw EVENT_BEAT_POKEFANM_COLIN
; trainer group && trainer id
db POKEFANM, COLIN
; text when seen
dw PokefanmColinSeenText
; text when trainer beaten
dw PokefanmColinBeatenText
; script when lost
dw $0000
; script when talk again
dw PokefanmColinScript
trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, $0000, PokefanmColinScript
PokefanmColinScript:
talkaftercancel
@@ -155,23 +139,7 @@ PokefanmColinScript:
end
TrainerTwinsMegandpeg1:
; bit/flag number
dw EVENT_BEAT_TWINS_MEG_AND_PEG
; trainer group && trainer id
db TWINS, MEGANDPEG1
; text when seen
dw TwinsMegandpeg1SeenText
; text when trainer beaten
dw TwinsMegandpeg1BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsMegandpeg1Script
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, $0000, TwinsMegandpeg1Script
TwinsMegandpeg1Script:
talkaftercancel
@@ -182,23 +150,7 @@ TwinsMegandpeg1Script:
end
TrainerTwinsMegandpeg2:
; bit/flag number
dw EVENT_BEAT_TWINS_MEG_AND_PEG
; trainer group && trainer id
db TWINS, MEGANDPEG2
; text when seen
dw TwinsMegandpeg2SeenText
; text when trainer beaten
dw TwinsMegandpeg2BeatenText
; script when lost
dw $0000
; script when talk again
dw TwinsMegandpeg2Script
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, $0000, TwinsMegandpeg2Script
TwinsMegandpeg2Script:
talkaftercancel
@@ -209,23 +161,7 @@ TwinsMegandpeg2Script:
end
TrainerPsychicRodney:
; bit/flag number
dw EVENT_BEAT_PSYCHIC_RODNEY
; trainer group && trainer id
db PSYCHIC_T, RODNEY
; text when seen
dw PsychicRodneySeenText
; text when trainer beaten
dw PsychicRodneyBeatenText
; script when lost
dw $0000
; script when talk again
dw PsychicRodneyScript
trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, $0000, PsychicRodneyScript
PsychicRodneyScript:
talkaftercancel
@@ -236,23 +172,7 @@ PsychicRodneyScript:
end
TrainerPokefanmJeremy:
; bit/flag number
dw EVENT_BEAT_POKEFANM_JEREMY
; trainer group && trainer id
db POKEFANM, JEREMY
; text when seen
dw PokefanmJeremySeenText
; text when trainer beaten
dw PokefanmJeremyBeatenText
; script when lost
dw $0000
; script when talk again
dw PokefanmJeremyScript
trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, $0000, PokefanmJeremyScript
PokefanmJeremyScript:
talkaftercancel
@@ -263,23 +183,7 @@ PokefanmJeremyScript:
end
TrainerPokefanfGeorgia:
; bit/flag number
dw EVENT_BEAT_POKEFANF_GEORGIA
; trainer group && trainer id
db POKEFANF, GEORGIA
; text when seen
dw PokefanfGeorgiaSeenText
; text when trainer beaten
dw PokefanfGeorgiaBeatenText
; script when lost
dw $0000
; script when talk again
dw PokefanfGeorgiaScript
trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, $0000, PokefanfGeorgiaScript
PokefanfGeorgiaScript:
talkaftercancel
@@ -290,23 +194,7 @@ PokefanfGeorgiaScript:
end
TrainerSupernerdShawn:
; bit/flag number
dw EVENT_BEAT_SUPER_NERD_SHAWN
; trainer group && trainer id
db SUPER_NERD, SHAWN
; text when seen
dw SupernerdShawnSeenText
; text when trainer beaten
dw SupernerdShawnBeatenText
; script when lost
dw $0000
; script when talk again
dw SupernerdShawnScript
trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, $0000, SupernerdShawnScript
SupernerdShawnScript:
talkaftercancel

View File

@@ -6,23 +6,7 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader:
db 0
TrainerFirebreatherLyle:
; bit/flag number
dw EVENT_BEAT_FIREBREATHER_LYLE
; trainer group && trainer id
db FIREBREATHER, LYLE
; text when seen
dw FirebreatherLyleSeenText
; text when trainer beaten
dw FirebreatherLyleBeatenText
; script when lost
dw $0000
; script when talk again
dw FirebreatherLyleScript
trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, $0000, FirebreatherLyleScript
FirebreatherLyleScript:
talkaftercancel
@@ -33,23 +17,7 @@ FirebreatherLyleScript:
end
TrainerBug_catcherKen:
; bit/flag number
dw EVENT_BEAT_BUG_CATCHER_KEN
; trainer group && trainer id
db BUG_CATCHER, KEN
; text when seen
dw Bug_catcherKenSeenText
; text when trainer beaten
dw Bug_catcherKenBeatenText
; script when lost
dw $0000
; script when talk again
dw Bug_catcherKenScript
trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, $0000, Bug_catcherKenScript
Bug_catcherKenScript:
talkaftercancel
@@ -60,23 +28,7 @@ Bug_catcherKenScript:
end
TrainerBeautyCassie:
; bit/flag number
dw EVENT_BEAT_BEAUTY_CASSIE
; trainer group && trainer id
db BEAUTY, CASSIE
; text when seen
dw BeautyCassieSeenText
; text when trainer beaten
dw BeautyCassieBeatenText
; script when lost
dw $0000
; script when talk again
dw BeautyCassieScript
trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, $0000, BeautyCassieScript
BeautyCassieScript:
talkaftercancel
@@ -87,23 +39,7 @@ BeautyCassieScript:
end
TrainerGuitaristClyde:
; bit/flag number
dw EVENT_BEAT_GUITARIST_CLYDE
; trainer group && trainer id
db GUITARIST, CLYDE
; text when seen
dw GuitaristClydeSeenText
; text when trainer beaten
dw GuitaristClydeBeatenText
; script when lost
dw $0000
; script when talk again
dw GuitaristClydeScript
trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, $0000, GuitaristClydeScript
GuitaristClydeScript:
talkaftercancel

View File

@@ -65,14 +65,14 @@ UnknownScript_0x54c33:
BillsSister:
faceplayer
loadfont
checkcellnum $3
checkcellnum PHONE_BILL
iftrue UnknownScript_0x54c58
writetext UnknownText_0x54f9e
askforphonenumber $3
askforphonenumber PHONE_BILL
if_equal $1, UnknownScript_0x54c64
if_equal $2, UnknownScript_0x54c5e
waitbutton
addcellnum $3
addcellnum PHONE_BILL
writetext UnknownText_0x54fd9
playsound SFX_REGISTER_PHONE_NUMBER
waitbutton

View File

@@ -87,23 +87,7 @@ GoldenrodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerLassCarrie:
; bit/flag number
dw EVENT_BEAT_LASS_CARRIE
; trainer group && trainer id
db LASS, CARRIE
; text when seen
dw LassCarrieSeenText
; text when trainer beaten
dw LassCarrieBeatenText
; script when lost
dw $0000
; script when talk again
dw LassCarrieScript
trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, $0000, LassCarrieScript
LassCarrieScript:
talkaftercancel
@@ -127,23 +111,7 @@ WhitneyCriesScript:
end
TrainerLassBridget:
; bit/flag number
dw EVENT_BEAT_LASS_BRIDGET
; trainer group && trainer id
db LASS, BRIDGET
; text when seen
dw LassBridgetSeenText
; text when trainer beaten
dw LassBridgetBeatenText
; script when lost
dw $0000
; script when talk again
dw LassBridgetScript
trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, $0000, LassBridgetScript
LassBridgetScript:
talkaftercancel
@@ -154,23 +122,7 @@ LassBridgetScript:
end
TrainerBeautyVictoria:
; bit/flag number
dw EVENT_BEAT_BEAUTY_VICTORIA
; trainer group && trainer id
db BEAUTY, VICTORIA
; text when seen
dw BeautyVictoriaSeenText
; text when trainer beaten
dw BeautyVictoriaBeatenText
; script when lost
dw $0000
; script when talk again
dw BeautyVictoriaScript
trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, $0000, BeautyVictoriaScript
BeautyVictoriaScript:
talkaftercancel
@@ -181,23 +133,7 @@ BeautyVictoriaScript:
end
TrainerBeautySamantha:
; bit/flag number
dw EVENT_BEAT_BEAUTY_SAMANTHA
; trainer group && trainer id
db BEAUTY, SAMANTHA
; text when seen
dw BeautySamanthaSeenText
; text when trainer beaten
dw BeautySamanthaBeatenText
; script when lost
dw $0000
; script when talk again
dw BeautySamanthaScript
trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, $0000, BeautySamanthaScript
BeautySamanthaScript:
talkaftercancel

View File

@@ -376,23 +376,7 @@ UnknownScript_0x6edf7:
end
TrainerBug_catcherWayne:
; bit/flag number
dw EVENT_BEAT_BUG_CATCHER_WAYNE
; trainer group && trainer id
db BUG_CATCHER, WAYNE
; text when seen
dw Bug_catcherWayneSeenText
; text when trainer beaten
dw Bug_catcherWayneBeatenText
; script when lost
dw $0000
; script when talk again
dw Bug_catcherWayneScript
trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, $0000, Bug_catcherWayneScript
Bug_catcherWayneScript:
talkaftercancel

View File

@@ -15,7 +15,7 @@ UnknownScript_0x7abb3:
end
UnknownScript_0x7abb4:
special Function27043
special ToggleDecorationsVisibility
setevent EVENT_007
checkevent EVENT_036
iftrue UnknownScript_0x7abc4

View File

@@ -137,23 +137,7 @@ UnknownScript_0x700b8:
end
TrainerFisherAndre:
; bit/flag number
dw EVENT_BEAT_FISHER_ANDRE
; trainer group && trainer id
db FISHER, ANDRE
; text when seen
dw FisherAndreSeenText
; text when trainer beaten
dw FisherAndreBeatenText
; script when lost
dw $0000
; script when talk again
dw FisherAndreScript
trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, $0000, FisherAndreScript
FisherAndreScript:
talkaftercancel
@@ -164,23 +148,7 @@ FisherAndreScript:
end
TrainerFisherRaymond:
; bit/flag number
dw EVENT_BEAT_FISHER_RAYMOND
; trainer group && trainer id
db FISHER, RAYMOND
; text when seen
dw FisherRaymondSeenText
; text when trainer beaten
dw FisherRaymondBeatenText
; script when lost
dw $0000
; script when talk again
dw FisherRaymondScript
trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, $0000, FisherRaymondScript
FisherRaymondScript:
talkaftercancel
@@ -191,23 +159,7 @@ FisherRaymondScript:
end
TrainerCooltrainermAaron:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_AARON
; trainer group && trainer id
db COOLTRAINERM, AARON
; text when seen
dw CooltrainermAaronSeenText
; text when trainer beaten
dw CooltrainermAaronBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermAaronScript
trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, $0000, CooltrainermAaronScript
CooltrainermAaronScript:
talkaftercancel
@@ -218,23 +170,7 @@ CooltrainermAaronScript:
end
TrainerCooltrainerfLois:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_LOIS
; trainer group && trainer id
db COOLTRAINERF, LOIS
; text when seen
dw CooltrainerfLoisSeenText
; text when trainer beaten
dw CooltrainerfLoisBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfLoisScript
trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, $0000, CooltrainerfLoisScript
CooltrainerfLoisScript:
talkaftercancel

View File

@@ -62,23 +62,7 @@ MahoganyGymTriggerRockets:
jumpstd radiotowerrockets
TrainerSkierRoxanne:
; bit/flag number
dw EVENT_BEAT_SKIER_ROXANNE
; trainer group && trainer id
db SKIER, ROXANNE
; text when seen
dw SkierRoxanneSeenText
; text when trainer beaten
dw SkierRoxanneBeatenText
; script when lost
dw $0000
; script when talk again
dw SkierRoxanneScript
trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, $0000, SkierRoxanneScript
SkierRoxanneScript:
talkaftercancel
@@ -89,23 +73,7 @@ SkierRoxanneScript:
end
TrainerSkierClarissa:
; bit/flag number
dw EVENT_BEAT_SKIER_CLARISSA
; trainer group && trainer id
db SKIER, CLARISSA
; text when seen
dw SkierClarissaSeenText
; text when trainer beaten
dw SkierClarissaBeatenText
; script when lost
dw $0000
; script when talk again
dw SkierClarissaScript
trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, $0000, SkierClarissaScript
SkierClarissaScript:
talkaftercancel
@@ -116,23 +84,7 @@ SkierClarissaScript:
end
TrainerBoarderRonald:
; bit/flag number
dw EVENT_BEAT_BOARDER_RONALD
; trainer group && trainer id
db BOARDER, RONALD
; text when seen
dw BoarderRonaldSeenText
; text when trainer beaten
dw BoarderRonaldBeatenText
; script when lost
dw $0000
; script when talk again
dw BoarderRonaldScript
trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, $0000, BoarderRonaldScript
BoarderRonaldScript:
talkaftercancel
@@ -143,23 +95,7 @@ BoarderRonaldScript:
end
TrainerBoarderBrad:
; bit/flag number
dw EVENT_BEAT_BOARDER_BRAD
; trainer group && trainer id
db BOARDER, BRAD
; text when seen
dw BoarderBradSeenText
; text when trainer beaten
dw BoarderBradBeatenText
; script when lost
dw $0000
; script when talk again
dw BoarderBradScript
trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, $0000, BoarderBradScript
BoarderBradScript:
talkaftercancel
@@ -170,23 +106,7 @@ BoarderBradScript:
end
TrainerBoarderDouglas:
; bit/flag number
dw EVENT_BEAT_BOARDER_DOUGLAS
; trainer group && trainer id
db BOARDER, DOUGLAS
; text when seen
dw BoarderDouglasSeenText
; text when trainer beaten
dw BoarderDouglasBeatenText
; script when lost
dw $0000
; script when talk again
dw BoarderDouglasScript
trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, $0000, BoarderDouglasScript
BoarderDouglasScript:
talkaftercancel

Some files were not shown because too many files have changed in this diff Show More