diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
| commit | 60cd04b02300c288a01a2f78a44cb39cbe6861d1 (patch) | |
| tree | ef5bb2bd660a2020864c909fb5dda73f027a9e7c /maps | |
| parent | e674869018ffe8f9be2351b2b569eb7300910e6a (diff) | |
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.
Diffstat (limited to 'maps')
90 files changed, 431 insertions, 5759 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index f1f78ba9a..88a00d7dc 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -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 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 9ab5cb56e..520b3bcd6 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -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 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 74605ec54..c1eeffdbd 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -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 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 0419b6184..d77747e60 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -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 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 3e7e94728..74358e9f6 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -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 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index c5d93d1ba..50e09e52f 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -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 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index ae6732323..3b79b707a 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -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 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index a1eece6bf..c4d98da3f 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -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 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index c816119e6..fdf6c3500 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -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 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 8efa83678..68d97039d 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -252,7 +252,7 @@ ElmDirectionsScript: writetext ElmDirectionsText1 closetext loadmovesprites - addcellnum $4 + addcellnum PHONE_ELM loadfont writetext GotElmsNumberText playsound SFX_REGISTER_PHONE_NUMBER diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 9f469d5c3..ce8e2e25b 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -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 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 78110d9d7..b357d9708 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -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 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a46c3dc0d..0607cb39b 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -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 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 2b888eeca..a1061e2b3 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -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 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 748e08d50..613c5a685 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -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 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 2b26752b5..c4d78d66c 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -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 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 6a7757db9..b948203ab 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -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 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f53281589..7988c8b88 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -15,7 +15,7 @@ UnknownScript_0x7abb3: end UnknownScript_0x7abb4: - special Function27043 + special ToggleDecorationsVisibility setevent EVENT_007 checkevent EVENT_036 iftrue UnknownScript_0x7abc4 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index b593b4857..dce2648c7 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -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 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 4fd966938..5d0607710 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -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 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 5f9fd0df7..9e015e4f2 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -6,23 +6,7 @@ MountMortar1FInside_MapScriptHeader: db 0 TrainerPokemaniacMiller: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_MILLER - - ; trainer group && trainer id - db POKEMANIAC, MILLER - - ; text when seen - dw PokemaniacMillerSeenText - - ; text when trainer beaten - dw PokemaniacMillerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, $0000, PokemaniacMillerScript PokemaniacMillerScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacMillerScript: end TrainerSupernerdMarkus: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_MARKUS - - ; trainer group && trainer id - db SUPER_NERD, MARKUS - - ; text when seen - dw SupernerdMarkusSeenText - - ; text when trainer beaten - dw SupernerdMarkusBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, $0000, SupernerdMarkusScript SupernerdMarkusScript: talkaftercancel diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 5ed548be5..e86a893e1 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -6,23 +6,7 @@ MountMortar2FInside_MapScriptHeader: db 0 TrainerSupernerdHugh: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_HUGH - - ; trainer group && trainer id - db SUPER_NERD, HUGH - - ; text when seen - dw SupernerdHughSeenText - - ; text when trainer beaten - dw SupernerdHughBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, $0000, SupernerdHughScript SupernerdHughScript: talkaftercancel diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index e9c596df7..63a09d80c 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -56,31 +56,15 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JACK - - ; trainer group && trainer id - db SCHOOLBOY, JACK1 - - ; text when seen - dw SchoolboyJack1SeenText - - ; text when trainer beaten - dw SchoolboyJack1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, $0000, SchoolboyJack1Script SchoolboyJack1Script: - writecode VAR_CALLERID, $5 + writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK talkaftercancel loadfont checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 - checkcellnum $5 + checkcellnum PHONE_SCHOOLBOY_JACK iftrue UnknownScript_0x5c108 checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5c071 @@ -93,7 +77,7 @@ SchoolboyJack1Script: UnknownScript_0x5c071: scall UnknownScript_0x5c100 UnknownScript_0x5c074: - askforphonenumber $5 + askforphonenumber PHONE_SCHOOLBOY_JACK if_equal $1, UnknownScript_0x5c110 if_equal $2, UnknownScript_0x5c10c trainertotext SCHOOLBOY, JACK1, $0 @@ -189,23 +173,7 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_WILLIAM - - ; trainer group && trainer id - db POKEFANM, WILLIAM - - ; text when seen - dw PokefanmWilliamSeenText - - ; text when trainer beaten - dw PokefanmWilliamBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, $0000, PokefanmWilliamScript PokefanmWilliamScript: talkaftercancel @@ -216,31 +184,15 @@ PokefanmWilliamScript: end TrainerPokefanfBeverly1: - ; bit/flag number - dw EVENT_BEAT_POKEFANF_BEVERLY - - ; trainer group && trainer id - db POKEFANF, BEVERLY1 - - ; text when seen - dw PokefanfBeverly1SeenText - - ; text when trainer beaten - dw PokefanfBeverly1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, $0000, PokefanfBeverly1Script PokefanfBeverly1Script: - writecode VAR_CALLERID, $6 + writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY talkaftercancel loadfont checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 - checkcellnum $6 + checkcellnum PHONE_POKEFAN_BEVERLY iftrue UnknownScript_0x5c19b checkpoke MARILL iffalse UnknownScript_0x5c189 @@ -255,7 +207,7 @@ PokefanfBeverly1Script: UnknownScript_0x5c160: scall UnknownScript_0x5c193 UnknownScript_0x5c163: - askforphonenumber $6 + askforphonenumber PHONE_POKEFAN_BEVERLY if_equal $1, UnknownScript_0x5c1a3 if_equal $2, UnknownScript_0x5c19f trainertotext POKEFANF, BEVERLY1, $0 @@ -311,23 +263,7 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - ; bit/flag number - dw EVENT_BEAT_LASS_KRISE - - ; trainer group && trainer id - db LASS, KRISE - - ; text when seen - dw LassKriseSeenText - - ; text when trainer beaten - dw LassKriseBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, $0000, LassKriseScript LassKriseScript: talkaftercancel diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 3b8578c35..c0d477a00 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -6,23 +6,7 @@ OlivineLighthouse2F_MapScriptHeader: db 0 TrainerGentlemanAlfred: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_ALFRED - - ; trainer group && trainer id - db GENTLEMAN, ALFRED - - ; text when seen - dw GentlemanAlfredSeenText - - ; text when trainer beaten - dw GentlemanAlfredBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, $0000, GentlemanAlfredScript GentlemanAlfredScript: talkaftercancel @@ -33,31 +17,15 @@ GentlemanAlfredScript: end TrainerSailorHuey1: - ; bit/flag number - dw EVENT_BEAT_SAILOR_HUEY - - ; trainer group && trainer id - db SAILOR, HUEY1 - - ; text when seen - dw SailorHuey1SeenText - - ; text when trainer beaten - dw SailorHuey1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, $0000, SailorHuey1Script SailorHuey1Script: - writecode VAR_CALLERID, $7 + writecode VAR_CALLERID, PHONE_SAILOR_HUEY talkaftercancel loadfont checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 - checkcellnum $7 + checkcellnum PHONE_SAILOR_HUEY iftrue UnknownScript_0x5b05f checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5afb0 @@ -68,7 +36,7 @@ SailorHuey1Script: UnknownScript_0x5afb0: scall UnknownScript_0x5b057 UnknownScript_0x5afb3: - askforphonenumber $7 + askforphonenumber PHONE_SAILOR_HUEY if_equal $1, UnknownScript_0x5b067 if_equal $2, UnknownScript_0x5b063 trainertotext SAILOR, HUEY1, $0 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ef5439cfb..60877be80 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -6,23 +6,7 @@ OlivineLighthouse3F_MapScriptHeader: db 0 TrainerBird_keeperTheo: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_THEO - - ; trainer group && trainer id - db BIRD_KEEPER, THEO - - ; text when seen - dw Bird_keeperTheoSeenText - - ; text when trainer beaten - dw Bird_keeperTheoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, $0000, Bird_keeperTheoScript Bird_keeperTheoScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperTheoScript: end TrainerGentlemanPreston: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_PRESTON - - ; trainer group && trainer id - db GENTLEMAN, PRESTON - - ; text when seen - dw GentlemanPrestonSeenText - - ; text when trainer beaten - dw GentlemanPrestonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, $0000, GentlemanPrestonScript GentlemanPrestonScript: talkaftercancel @@ -60,23 +28,7 @@ GentlemanPrestonScript: end TrainerSailorTerrell: - ; bit/flag number - dw EVENT_BEAT_SAILOR_TERRELL - - ; trainer group && trainer id - db SAILOR, TERRELL - - ; text when seen - dw SailorTerrellSeenText - - ; text when trainer beaten - dw SailorTerrellBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, $0000, SailorTerrellScript SailorTerrellScript: talkaftercancel diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index e764fa535..c8f921a61 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -6,23 +6,7 @@ OlivineLighthouse4F_MapScriptHeader: db 0 TrainerLassConnie: - ; bit/flag number - dw EVENT_BEAT_LASS_CONNIE - - ; trainer group && trainer id - db LASS, CONNIE1 - - ; text when seen - dw LassConnie1SeenText - - ; text when trainer beaten - dw LassConnie1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, $0000, LassConnie1Script LassConnie1Script: talkaftercancel @@ -33,23 +17,7 @@ LassConnie1Script: end TrainerSailorKent: - ; bit/flag number - dw EVENT_BEAT_SAILOR_KENT - - ; trainer group && trainer id - db SAILOR, KENT - - ; text when seen - dw SailorKentSeenText - - ; text when trainer beaten - dw SailorKentBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, $0000, SailorKentScript SailorKentScript: talkaftercancel diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ec7b83ca9..b4dc5cb40 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,23 +6,7 @@ OlivineLighthouse5F_MapScriptHeader: db 0 TrainerBird_keeperDenis: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_DENIS - - ; trainer group && trainer id - db BIRD_KEEPER, DENIS - - ; text when seen - dw Bird_keeperDenisSeenText - - ; text when trainer beaten - dw Bird_keeperDenisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, $0000, Bird_keeperDenisScript Bird_keeperDenisScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperDenisScript: end TrainerSailorErnest: - ; bit/flag number - dw EVENT_BEAT_SAILOR_ERNEST - - ; trainer group && trainer id - db SAILOR, ERNEST - - ; text when seen - dw SailorErnestSeenText - - ; text when trainer beaten - dw SailorErnestBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, $0000, SailorErnestScript SailorErnestScript: talkaftercancel diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index fcac4b8ec..60317d163 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -36,23 +36,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - ; bit/flag number - dw EVENT_BEAT_CAMPER_JERRY - - ; trainer group && trainer id - db CAMPER, JERRY - - ; text when seen - dw CamperJerrySeenText - - ; text when trainer beaten - dw CamperJerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, $0000, CamperJerryScript CamperJerryScript: talkaftercancel diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 4244eb31e..529204956 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -178,23 +178,7 @@ YoungsterScript_0x5ce54: jumptextfaceplayer UnknownText_0x5d4ac TrainerGruntM3: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_3 - - ; trainer group && trainer id - db GRUNTM, 3 - - ; text when seen - dw GruntM3SeenText - - ; text when trainer beaten - dw GruntM3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, $0000, GruntM3Script GruntM3Script: talkaftercancel diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index afd3e39bb..ba7f340a5 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -42,23 +42,7 @@ BlackBeltScript_0x5d722: jumptextfaceplayer UnknownText_0x5da44 TrainerGruntM4: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_4 - - ; trainer group && trainer id - db GRUNTM, 4 - - ; text when seen - dw GruntM4SeenText - - ; text when trainer beaten - dw GruntM4BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, $0000, GruntM4Script GruntM4Script: talkaftercancel @@ -69,23 +53,7 @@ GruntM4Script: end TrainerGruntM5: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_5 - - ; trainer group && trainer id - db GRUNTM, 5 - - ; text when seen - dw GruntM5SeenText - - ; text when trainer beaten - dw GruntM5BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, $0000, GruntM5Script GruntM5Script: talkaftercancel @@ -96,23 +64,7 @@ GruntM5Script: end TrainerGruntM6: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_6 - - ; trainer group && trainer id - db GRUNTM, 6 - - ; text when seen - dw GruntM6SeenText - - ; text when trainer beaten - dw GruntM6BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, $0000, GruntM6Script GruntM6Script: talkaftercancel @@ -123,23 +75,7 @@ GruntM6Script: end TrainerGruntF2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_2 - - ; trainer group && trainer id - db GRUNTF, 2 - - ; text when seen - dw GruntF2SeenText - - ; text when trainer beaten - dw GruntF2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, $0000, GruntF2Script GruntF2Script: talkaftercancel @@ -220,7 +156,7 @@ UnknownScript_0x5d80a: writetext UnknownText_0x5de10 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d81a checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -242,7 +178,7 @@ UnknownScript_0x5d82f: writetext UnknownText_0x5df6c closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d83f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -279,7 +215,7 @@ UnknownScript_0x5d86b: writetext UnknownText_0x5e192 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d87b checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -291,7 +227,7 @@ UnknownScript_0x5d87f: writetext UnknownText_0x5e0f1 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d88f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -303,7 +239,7 @@ UnknownScript_0x5d893: writetext UnknownText_0x5e131 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8a3 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -311,7 +247,7 @@ UnknownScript_0x5d8a3: end UnknownScript_0x5d8a4: - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8fe pause 20 spriteface $b, DOWN @@ -331,7 +267,7 @@ UnknownScript_0x5d8cc: loadfont writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: - askforphonenumber $25 + askforphonenumber PHONE_BUENA if_equal $1, UnknownScript_0x5d8f6 if_equal $2, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 @@ -342,7 +278,7 @@ UnknownScript_0x5d8d0: closetext loadmovesprites spriteface $b, RIGHT - addcellnum $25 + addcellnum PHONE_BUENA end UnknownScript_0x5d8ed: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 4572bf872..cf03f9077 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -77,23 +77,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_7 - - ; trainer group && trainer id - db GRUNTM, 7 - - ; text when seen - dw GruntM7SeenText - - ; text when trainer beaten - dw GruntM7BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, $0000, GruntM7Script GruntM7Script: talkaftercancel @@ -104,23 +88,7 @@ GruntM7Script: end TrainerGruntM8: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_8 - - ; trainer group && trainer id - db GRUNTM, 8 - - ; text when seen - dw GruntM8SeenText - - ; text when trainer beaten - dw GruntM8BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, $0000, GruntM8Script GruntM8Script: talkaftercancel @@ -131,23 +99,7 @@ GruntM8Script: end TrainerGruntM9: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_9 - - ; trainer group && trainer id - db GRUNTM, 9 - - ; text when seen - dw GruntM9SeenText - - ; text when trainer beaten - dw GruntM9BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, $0000, GruntM9Script GruntM9Script: talkaftercancel @@ -158,23 +110,7 @@ GruntM9Script: end TrainerScientistMarc: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_MARC - - ; trainer group && trainer id - db SCIENTIST, MARC - - ; text when seen - dw ScientistMarcSeenText - - ; text when trainer beaten - dw ScientistMarcBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, $0000, ScientistMarcScript ScientistMarcScript: talkaftercancel diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index c5c459d2a..6acc6905d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -47,23 +47,7 @@ GrowlitheScript_0x5ebb2: end TrainerGruntM10: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_10 - - ; trainer group && trainer id - db GRUNTM, 10 - - ; text when seen - dw GruntM10SeenText - - ; text when trainer beaten - dw GruntM10BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, $0000, GruntM10Script GruntM10Script: talkaftercancel @@ -74,23 +58,7 @@ GruntM10Script: end TrainerExecutivem2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_EXECUTIVEM_2 - - ; trainer group && trainer id - db EXECUTIVEM, 2 - - ; text when seen - dw Executivem2SeenText - - ; text when trainer beaten - dw Executivem2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, $0000, Executivem2Script Executivem2Script: talkaftercancel @@ -101,23 +69,7 @@ Executivem2Script: end TrainerGruntF4: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_4 - - ; trainer group && trainer id - db GRUNTF, 4 - - ; text when seen - dw GruntF4SeenText - - ; text when trainer beaten - dw GruntF4BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, $0000, GruntF4Script GruntF4Script: talkaftercancel @@ -128,23 +80,7 @@ GruntF4Script: end TrainerScientistRich: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_RICH - - ; trainer group && trainer id - db SCIENTIST, RICH - - ; text when seen - dw ScientistRichSeenText - - ; text when trainer beaten - dw ScientistRichBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, $0000, ScientistRichScript ScientistRichScript: talkaftercancel diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 27ca29c88..a41693743 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -63,23 +63,7 @@ UnknownScript_0x60054: end TrainerExecutivef1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_EXECUTIVEF_1 - - ; trainer group && trainer id - db EXECUTIVEF, 1 - - ; text when seen - dw Executivef1SeenText - - ; text when trainer beaten - dw Executivef1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, $0000, Executivef1Script Executivef1Script: talkaftercancel diff --git a/maps/Route1.asm b/maps/Route1.asm index 3dad15826..39c8ac128 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -6,23 +6,7 @@ Route1_MapScriptHeader: db 0 TrainerSchoolboyDanny: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_DANNY - - ; trainer group && trainer id - db SCHOOLBOY, DANNY - - ; text when seen - dw SchoolboyDannySeenText - - ; text when trainer beaten - dw SchoolboyDannyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, $0000, SchoolboyDannyScript SchoolboyDannyScript: talkaftercancel @@ -33,23 +17,7 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_QUINN - - ; trainer group && trainer id - db COOLTRAINERF, QUINN - - ; text when seen - dw CooltrainerfQuinnSeenText - - ; text when trainer beaten - dw CooltrainerfQuinnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, $0000, CooltrainerfQuinnScript CooltrainerfQuinnScript: talkaftercancel diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 3d850317e..e1214f36c 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -6,23 +6,7 @@ Route10South_MapScriptHeader: db 0 TrainerHikerJim: - ; bit/flag number - dw EVENT_BEAT_HIKER_JIM - - ; trainer group && trainer id - db HIKER, JIM - - ; text when seen - dw HikerJimSeenText - - ; text when trainer beaten - dw HikerJimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, $0000, HikerJimScript HikerJimScript: talkaftercancel @@ -33,23 +17,7 @@ HikerJimScript: end TrainerPokefanmRobert: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ROBERT - - ; trainer group && trainer id - db POKEFANM, ROBERT - - ; text when seen - dw PokefanmRobertSeenText - - ; text when trainer beaten - dw PokefanmRobertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, $0000, PokefanmRobertScript PokefanmRobertScript: talkaftercancel diff --git a/maps/Route11.asm b/maps/Route11.asm index 4f809febc..8ce0ed7a0 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,23 +6,7 @@ Route11_MapScriptHeader: db 0 TrainerYoungsterOwen: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_OWEN - - ; trainer group && trainer id - db YOUNGSTER, OWEN - - ; text when seen - dw YoungsterOwenSeenText - - ; text when trainer beaten - dw YoungsterOwenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript YoungsterOwenScript: talkaftercancel @@ -33,23 +17,7 @@ YoungsterOwenScript: end TrainerYoungsterJason: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JASON - - ; trainer group && trainer id - db YOUNGSTER, JASON - - ; text when seen - dw YoungsterJasonSeenText - - ; text when trainer beaten - dw YoungsterJasonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript YoungsterJasonScript: talkaftercancel @@ -60,23 +28,7 @@ YoungsterJasonScript: end TrainerPsychicHerman: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_HERMAN - - ; trainer group && trainer id - db PSYCHIC_T, HERMAN - - ; text when seen - dw PsychicHermanSeenText - - ; text when trainer beaten - dw PsychicHermanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript PsychicHermanScript: talkaftercancel @@ -87,23 +39,7 @@ PsychicHermanScript: end TrainerPsychicFidel: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_FIDEL - - ; trainer group && trainer id - db PSYCHIC_T, FIDEL - - ; text when seen - dw PsychicFidelSeenText - - ; text when trainer beaten - dw PsychicFidelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript PsychicFidelScript: talkaftercancel diff --git a/maps/Route12.asm b/maps/Route12.asm index a13cec780..8b1e52dfd 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,23 +6,7 @@ Route12_MapScriptHeader: db 0 TrainerFisherKyle: - ; bit/flag number - dw EVENT_BEAT_FISHER_KYLE - - ; trainer group && trainer id - db FISHER, KYLE - - ; text when seen - dw FisherKyleSeenText - - ; text when trainer beaten - dw FisherKyleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, $0000, FisherKyleScript FisherKyleScript: talkaftercancel @@ -33,23 +17,7 @@ FisherKyleScript: end TrainerFisherMartin: - ; bit/flag number - dw EVENT_BEAT_FISHER_MARTIN - - ; trainer group && trainer id - db FISHER, MARTIN - - ; text when seen - dw FisherMartinSeenText - - ; text when trainer beaten - dw FisherMartinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, $0000, FisherMartinScript FisherMartinScript: talkaftercancel @@ -60,23 +28,7 @@ FisherMartinScript: end TrainerFisherStephen: - ; bit/flag number - dw EVENT_BEAT_FISHER_STEPHEN - - ; trainer group && trainer id - db FISHER, STEPHEN - - ; text when seen - dw FisherStephenSeenText - - ; text when trainer beaten - dw FisherStephenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, $0000, FisherStephenScript FisherStephenScript: talkaftercancel @@ -87,23 +39,7 @@ FisherStephenScript: end TrainerFisherBarney: - ; bit/flag number - dw EVENT_BEAT_FISHER_BARNEY - - ; trainer group && trainer id - db FISHER, BARNEY - - ; text when seen - dw FisherBarneySeenText - - ; text when trainer beaten - dw FisherBarneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, $0000, FisherBarneyScript FisherBarneyScript: talkaftercancel diff --git a/maps/Route13.asm b/maps/Route13.asm index c8627721d..b2e03f13e 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,23 +6,7 @@ Route13_MapScriptHeader: db 0 TrainerPokefanmAlex: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ALEX - - ; trainer group && trainer id - db POKEFANM, ALEX - - ; text when seen - dw PokefanmAlexSeenText - - ; text when trainer beaten - dw PokefanmAlexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, $0000, PokefanmAlexScript PokefanmAlexScript: talkaftercancel @@ -33,23 +17,7 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_JOSHUA - - ; trainer group && trainer id - db POKEFANM, JOSHUA - - ; text when seen - dw PokefanmJoshuaSeenText - - ; text when trainer beaten - dw PokefanmJoshuaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, $0000, PokefanmJoshuaScript PokefanmJoshuaScript: talkaftercancel @@ -60,23 +28,7 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_PERRY - - ; trainer group && trainer id - db BIRD_KEEPER, PERRY - - ; text when seen - dw Bird_keeperPerrySeenText - - ; text when trainer beaten - dw Bird_keeperPerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, $0000, Bird_keeperPerryScript Bird_keeperPerryScript: talkaftercancel @@ -87,23 +39,7 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BRET - - ; trainer group && trainer id - db BIRD_KEEPER, BRET - - ; text when seen - dw Bird_keeperBretSeenText - - ; text when trainer beaten - dw Bird_keeperBretBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, $0000, Bird_keeperBretScript Bird_keeperBretScript: talkaftercancel @@ -114,23 +50,7 @@ Bird_keeperBretScript: end TrainerHikerKenny: - ; bit/flag number - dw EVENT_BEAT_HIKER_KENNY - - ; trainer group && trainer id - db HIKER, KENNY - - ; text when seen - dw HikerKennySeenText - - ; text when trainer beaten - dw HikerKennyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, $0000, HikerKennyScript HikerKennyScript: talkaftercancel diff --git a/maps/Route14.asm b/maps/Route14.asm index 61dbc2006..bcd4ace8e 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -14,23 +14,7 @@ TeacherScript_0x1ad47f: end TrainerPokefanmCarter: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_CARTER - - ; trainer group && trainer id - db POKEFANM, CARTER - - ; text when seen - dw PokefanmCarterSeenText - - ; text when trainer beaten - dw PokefanmCarterBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, $0000, PokefanmCarterScript PokefanmCarterScript: talkaftercancel @@ -41,23 +25,7 @@ PokefanmCarterScript: end TrainerBird_keeperRoy: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ROY - - ; trainer group && trainer id - db BIRD_KEEPER, ROY - - ; text when seen - dw Bird_keeperRoySeenText - - ; text when trainer beaten - dw Bird_keeperRoyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, $0000, Bird_keeperRoyScript Bird_keeperRoyScript: talkaftercancel @@ -68,23 +36,7 @@ Bird_keeperRoyScript: end TrainerPokefanmTrevor: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_TREVOR - - ; trainer group && trainer id - db POKEFANM, TREVOR - - ; text when seen - dw PokefanmTrevorSeenText - - ; text when trainer beaten - dw PokefanmTrevorBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, $0000, PokefanmTrevorScript PokefanmTrevorScript: talkaftercancel diff --git a/maps/Route15.asm b/maps/Route15.asm index bcb5129f2..4a9b8ccc0 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -6,23 +6,7 @@ Route15_MapScriptHeader: db 0 TrainerTeacherColette: - ; bit/flag number - dw EVENT_BEAT_TEACHER_COLETTE - - ; trainer group && trainer id - db TEACHER, COLETTE - - ; text when seen - dw TeacherColetteSeenText - - ; text when trainer beaten - dw TeacherColetteBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, $0000, TeacherColetteScript TeacherColetteScript: talkaftercancel @@ -33,23 +17,7 @@ TeacherColetteScript: end TrainerTeacherHillary: - ; bit/flag number - dw EVENT_BEAT_TEACHER_HILLARY - - ; trainer group && trainer id - db TEACHER, HILLARY - - ; text when seen - dw TeacherHillarySeenText - - ; text when trainer beaten - dw TeacherHillaryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, $0000, TeacherHillaryScript TeacherHillaryScript: talkaftercancel @@ -60,23 +28,7 @@ TeacherHillaryScript: end TrainerSchoolboyKipp: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_KIP - - ; trainer group && trainer id - db SCHOOLBOY, KIPP - - ; text when seen - dw SchoolboyKippSeenText - - ; text when trainer beaten - dw SchoolboyKippBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, $0000, SchoolboyKippScript SchoolboyKippScript: talkaftercancel @@ -87,23 +39,7 @@ SchoolboyKippScript: end TrainerSchoolboyTommy: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_TOMMY - - ; trainer group && trainer id - db SCHOOLBOY, TOMMY - - ; text when seen - dw SchoolboyTommySeenText - - ; text when trainer beaten - dw SchoolboyTommyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, $0000, SchoolboyTommyScript SchoolboyTommyScript: talkaftercancel @@ -114,23 +50,7 @@ SchoolboyTommyScript: end TrainerSchoolboyJohnny: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JOHNNY - - ; trainer group && trainer id - db SCHOOLBOY, JOHNNY - - ; text when seen - dw SchoolboyJohnnySeenText - - ; text when trainer beaten - dw SchoolboyJohnnyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, $0000, SchoolboyJohnnyScript SchoolboyJohnnyScript: talkaftercancel @@ -141,23 +61,7 @@ SchoolboyJohnnyScript: end TrainerSchoolboyBilly: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_BILLY - - ; trainer group && trainer id - db SCHOOLBOY, BILLY - - ; text when seen - dw SchoolboyBillySeenText - - ; text when trainer beaten - dw SchoolboyBillyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, $0000, SchoolboyBillyScript SchoolboyBillyScript: talkaftercancel diff --git a/maps/Route17.asm b/maps/Route17.asm index 2c7e2a605..bcb008f83 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -15,23 +15,7 @@ UnknownScript_0x1ad0ab: return TrainerBikerCharles: - ; bit/flag number - dw EVENT_BEAT_BIKER_CHARLES - - ; trainer group && trainer id - db BIKER, CHARLES - - ; text when seen - dw BikerCharlesSeenText - - ; text when trainer beaten - dw BikerCharlesBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, $0000, BikerCharlesScript BikerCharlesScript: talkaftercancel @@ -42,23 +26,7 @@ BikerCharlesScript: end TrainerBikerRiley: - ; bit/flag number - dw EVENT_BEAT_BIKER_RILEY - - ; trainer group && trainer id - db BIKER, RILEY - - ; text when seen - dw BikerRileySeenText - - ; text when trainer beaten - dw BikerRileyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, $0000, BikerRileyScript BikerRileyScript: talkaftercancel @@ -69,23 +37,7 @@ BikerRileyScript: end TrainerBikerJoel: - ; bit/flag number - dw EVENT_BEAT_BIKER_JOEL - - ; trainer group && trainer id - db BIKER, JOEL - - ; text when seen - dw BikerJoelSeenText - - ; text when trainer beaten - dw BikerJoelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, $0000, BikerJoelScript BikerJoelScript: talkaftercancel @@ -96,23 +48,7 @@ BikerJoelScript: end TrainerBikerGlenn: - ; bit/flag number - dw EVENT_BEAT_BIKER_GLENN - - ; trainer group && trainer id - db BIKER, GLENN - - ; text when seen - dw BikerGlennSeenText - - ; text when trainer beaten - dw BikerGlennBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, $0000, BikerGlennScript BikerGlennScript: talkaftercancel diff --git a/maps/Route18.asm b/maps/Route18.asm index 54c1b7c03..ad8fea515 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -6,23 +6,7 @@ Route18_MapScriptHeader: db 0 TrainerBird_keeperBoris: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BORIS - - ; trainer group && trainer id - db BIRD_KEEPER, BORIS - - ; text when seen - dw Bird_keeperBorisSeenText - - ; text when trainer beaten - dw Bird_keeperBorisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript Bird_keeperBorisScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperBorisScript: end TrainerBird_keeperBob: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BOB - - ; trainer group && trainer id - db BIRD_KEEPER, BOB - - ; text when seen - dw Bird_keeperBobSeenText - - ; text when trainer beaten - dw Bird_keeperBobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript Bird_keeperBobScript: talkaftercancel diff --git a/maps/Route19.asm b/maps/Route19.asm index e9f246767..aea246b2b 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -22,23 +22,7 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_DAWN - - ; trainer group && trainer id - db SWIMMERF, DAWN - - ; text when seen - dw SwimmerfDawnSeenText - - ; text when trainer beaten - dw SwimmerfDawnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, $0000, SwimmerfDawnScript SwimmerfDawnScript: talkaftercancel @@ -49,23 +33,7 @@ SwimmerfDawnScript: end TrainerSwimmermHarold: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_HAROLD - - ; trainer group && trainer id - db SWIMMERM, HAROLD - - ; text when seen - dw SwimmermHaroldSeenText - - ; text when trainer beaten - dw SwimmermHaroldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, $0000, SwimmermHaroldScript SwimmermHaroldScript: talkaftercancel @@ -76,23 +44,7 @@ SwimmermHaroldScript: end TrainerSwimmermJerome: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_JEROME - - ; trainer group && trainer id - db SWIMMERM, JEROME - - ; text when seen - dw SwimmermJeromeSeenText - - ; text when trainer beaten - dw SwimmermJeromeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, $0000, SwimmermJeromeScript SwimmermJeromeScript: talkaftercancel @@ -103,23 +55,7 @@ SwimmermJeromeScript: end TrainerSwimmermTucker: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_TUCKER - - ; trainer group && trainer id - db SWIMMERM, TUCKER - - ; text when seen - dw SwimmermTuckerSeenText - - ; text when trainer beaten - dw SwimmermTuckerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, $0000, SwimmermTuckerScript SwimmermTuckerScript: talkaftercancel diff --git a/maps/Route2.asm b/maps/Route2.asm index 6268a1f8a..e6fbff570 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -6,23 +6,7 @@ Route2_MapScriptHeader: db 0 TrainerBug_catcherRob: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ROB - - ; trainer group && trainer id - db BUG_CATCHER, ROB - - ; text when seen - dw Bug_catcherRobSeenText - - ; text when trainer beaten - dw Bug_catcherRobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript Bug_catcherRobScript: talkaftercancel @@ -33,23 +17,7 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ED - - ; trainer group && trainer id - db BUG_CATCHER, ED - - ; text when seen - dw Bug_catcherEdSeenText - - ; text when trainer beaten - dw Bug_catcherEdBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript Bug_catcherEdScript: talkaftercancel @@ -60,23 +28,7 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_DOUG - - ; trainer group && trainer id - db BUG_CATCHER, DOUG - - ; text when seen - dw Bug_catcherDougSeenText - - ; text when trainer beaten - dw Bug_catcherDougBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript Bug_catcherDougScript: talkaftercancel diff --git a/maps/Route20.asm b/maps/Route20.asm index 279baa4d2..9a354d11a 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -14,23 +14,7 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_NICOLE - - ; trainer group && trainer id - db SWIMMERF, NICOLE - - ; text when seen - dw SwimmerfNicoleSeenText - - ; text when trainer beaten - dw SwimmerfNicoleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript SwimmerfNicoleScript: talkaftercancel @@ -41,23 +25,7 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_LORI - - ; trainer group && trainer id - db SWIMMERF, LORI - - ; text when seen - dw SwimmerfLoriSeenText - - ; text when trainer beaten - dw SwimmerfLoriBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript SwimmerfLoriScript: talkaftercancel @@ -68,23 +36,7 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_CAMERON - - ; trainer group && trainer id - db SWIMMERM, CAMERON - - ; text when seen - dw SwimmermCameronSeenText - - ; text when trainer beaten - dw SwimmermCameronBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript SwimmermCameronScript: talkaftercancel diff --git a/maps/Route21.asm b/maps/Route21.asm index 60fb9a37a..db5d2e964 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -6,23 +6,7 @@ Route21_MapScriptHeader: db 0 TrainerSwimmermSeth: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_SETH - - ; trainer group && trainer id - db SWIMMERM, SETH - - ; text when seen - dw SwimmermSethSeenText - - ; text when trainer beaten - dw SwimmermSethBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, $0000, SwimmermSethScript SwimmermSethScript: talkaftercancel @@ -33,23 +17,7 @@ SwimmermSethScript: end TrainerSwimmerfNikki: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_NIKKI - - ; trainer group && trainer id - db SWIMMERF, NIKKI - - ; text when seen - dw SwimmerfNikkiSeenText - - ; text when trainer beaten - dw SwimmerfNikkiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, $0000, SwimmerfNikkiScript SwimmerfNikkiScript: talkaftercancel @@ -60,23 +28,7 @@ SwimmerfNikkiScript: end TrainerFisherArnold: - ; bit/flag number - dw EVENT_BEAT_FISHER_ARNOLD - - ; trainer group && trainer id - db FISHER, ARNOLD - - ; text when seen - dw FisherArnoldSeenText - - ; text when trainer beaten - dw FisherArnoldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, $0000, FisherArnoldScript FisherArnoldScript: talkaftercancel diff --git a/maps/Route25.asm b/maps/Route25.asm index 7c21304f6..f7cda564b 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -68,23 +68,7 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_DUDLEY - - ; trainer group && trainer id - db SCHOOLBOY, DUDLEY - - ; text when seen - dw SchoolboyDudleySeenText - - ; text when trainer beaten - dw SchoolboyDudleyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, $0000, SchoolboyDudleyScript SchoolboyDudleyScript: talkaftercancel @@ -95,23 +79,7 @@ SchoolboyDudleyScript: end TrainerLassEllen: - ; bit/flag number - dw EVENT_BEAT_LASS_ELLEN - - ; trainer group && trainer id - db LASS, ELLEN - - ; text when seen - dw LassEllenSeenText - - ; text when trainer beaten - dw LassEllenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, $0000, LassEllenScript LassEllenScript: talkaftercancel @@ -122,23 +90,7 @@ LassEllenScript: end TrainerSchoolboyJoe: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JOE - - ; trainer group && trainer id - db SCHOOLBOY, JOE - - ; text when seen - dw SchoolboyJoeSeenText - - ; text when trainer beaten - dw SchoolboyJoeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, $0000, SchoolboyJoeScript SchoolboyJoeScript: talkaftercancel @@ -149,23 +101,7 @@ SchoolboyJoeScript: end TrainerLassLaura: - ; bit/flag number - dw EVENT_BEAT_LASS_LAURA - - ; trainer group && trainer id - db LASS, LAURA - - ; text when seen - dw LassLauraSeenText - - ; text when trainer beaten - dw LassLauraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, $0000, LassLauraScript LassLauraScript: talkaftercancel @@ -176,23 +112,7 @@ LassLauraScript: end TrainerCamperLloyd: - ; bit/flag number - dw EVENT_BEAT_CAMPER_LLOYD - - ; trainer group && trainer id - db CAMPER, LLOYD - - ; text when seen - dw CamperLloydSeenText - - ; text when trainer beaten - dw CamperLloydBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, $0000, CamperLloydScript CamperLloydScript: talkaftercancel @@ -203,23 +123,7 @@ CamperLloydScript: end TrainerLassShannon: - ; bit/flag number - dw EVENT_BEAT_LASS_SHANNON - - ; trainer group && trainer id - db LASS, SHANNON - - ; text when seen - dw LassShannonSeenText - - ; text when trainer beaten - dw LassShannonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, $0000, LassShannonScript LassShannonScript: talkaftercancel @@ -230,23 +134,7 @@ LassShannonScript: end TrainerSupernerdPat: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_PAT - - ; trainer group && trainer id - db SUPER_NERD, PAT - - ; text when seen - dw SupernerdPatSeenText - - ; text when trainer beaten - dw SupernerdPatBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, $0000, SupernerdPatScript SupernerdPatScript: talkaftercancel diff --git a/maps/Route26.asm b/maps/Route26.asm index a059989e1..62f0d779b 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -6,23 +6,7 @@ Route26_MapScriptHeader: db 0 TrainerCooltrainermJake: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_JAKE - - ; trainer group && trainer id - db COOLTRAINERM, JAKE - - ; text when seen - dw CooltrainermJakeSeenText - - ; text when trainer beaten - dw CooltrainermJakeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, $0000, CooltrainermJakeScript CooltrainermJakeScript: talkaftercancel @@ -33,31 +17,15 @@ CooltrainermJakeScript: end TrainerCooltrainermGaven3: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_GAVEN - - ; trainer group && trainer id - db COOLTRAINERM, GAVEN3 - - ; text when seen - dw CooltrainermGaven3SeenText - - ; text when trainer beaten - dw CooltrainermGaven3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, $0000, CooltrainermGaven3Script CooltrainermGaven3Script: - writecode VAR_CALLERID, $b + writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN talkaftercancel loadfont checkflag ENGINE_GAVEN iftrue UnknownScript_0x1a4d79 - checkcellnum $b + checkcellnum PHONE_COOLTRAINERM_GAVEN iftrue UnknownScript_0x1a4dcb checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4d62 @@ -70,7 +38,7 @@ CooltrainermGaven3Script: UnknownScript_0x1a4d62: scall UnknownScript_0x1a4dc3 UnknownScript_0x1a4d65: - askforphonenumber $b + askforphonenumber PHONE_COOLTRAINERM_GAVEN if_equal $1, UnknownScript_0x1a4dd3 if_equal $2, UnknownScript_0x1a4dcf trainertotext COOLTRAINERM, GAVEN3, $0 @@ -142,23 +110,7 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_JOYCE - - ; trainer group && trainer id - db COOLTRAINERF, JOYCE - - ; text when seen - dw CooltrainerfJoyceSeenText - - ; text when trainer beaten - dw CooltrainerfJoyceBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, $0000, CooltrainerfJoyceScript CooltrainerfJoyceScript: talkaftercancel @@ -169,31 +121,15 @@ CooltrainerfJoyceScript: end TrainerCooltrainerfBeth1: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_BETH - - ; trainer group && trainer id - db COOLTRAINERF, BETH1 - - ; text when seen - dw CooltrainerfBeth1SeenText - - ; text when trainer beaten - dw CooltrainerfBeth1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, $0000, CooltrainerfBeth1Script CooltrainerfBeth1Script: - writecode VAR_CALLERID, $c + writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH talkaftercancel loadfont checkflag ENGINE_BETH iftrue UnknownScript_0x1a4e35 - checkcellnum $c + checkcellnum PHONE_COOLTRAINERF_BETH iftrue UnknownScript_0x1a4e87 checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4e1e @@ -206,7 +142,7 @@ CooltrainerfBeth1Script: UnknownScript_0x1a4e1e: scall UnknownScript_0x1a4e7f UnknownScript_0x1a4e21: - askforphonenumber $c + askforphonenumber PHONE_COOLTRAINERF_BETH if_equal $1, UnknownScript_0x1a4e8f if_equal $2, UnknownScript_0x1a4e8b trainertotext COOLTRAINERF, BETH1, $0 @@ -278,23 +214,7 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_RICHARD - - ; trainer group && trainer id - db PSYCHIC_T, RICHARD - - ; text when seen - dw PsychicRichardSeenText - - ; text when trainer beaten - dw PsychicRichardBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, $0000, PsychicRichardScript PsychicRichardScript: talkaftercancel @@ -305,23 +225,7 @@ PsychicRichardScript: end TrainerFisherScott: - ; bit/flag number - dw EVENT_BEAT_FISHER_SCOTT - - ; trainer group && trainer id - db FISHER, SCOTT - - ; text when seen - dw FisherScottSeenText - - ; text when trainer beaten - dw FisherScottBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, $0000, FisherScottScript FisherScottScript: talkaftercancel diff --git a/maps/Route27.asm b/maps/Route27.asm index c17ad1e8f..2714054a1 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -40,23 +40,7 @@ FisherScript_0x1a089c: jumptextfaceplayer UnknownText_0x1a0a71 TrainerPsychicGilbert: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_GILBERT - - ; trainer group && trainer id - db PSYCHIC_T, GILBERT - - ; text when seen - dw PsychicGilbertSeenText - - ; text when trainer beaten - dw PsychicGilbertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, $0000, PsychicGilbertScript PsychicGilbertScript: talkaftercancel @@ -67,33 +51,17 @@ PsychicGilbertScript: end TrainerBird_keeperJose2: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_JOSE2 - - ; trainer group && trainer id - db BIRD_KEEPER, JOSE2 - - ; text when seen - dw Bird_keeperJose2SeenText - - ; text when trainer beaten - dw Bird_keeperJose2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, $0000, Bird_keeperJose2Script Bird_keeperJose2Script: - writecode VAR_CALLERID, $d + writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE talkaftercancel loadfont checkflag ENGINE_JOSE iftrue UnknownScript_0x1a08ff checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue UnknownScript_0x1a0945 - checkcellnum $d + checkcellnum PHONE_BIRDKEEPER_JOSE iftrue UnknownScript_0x1a0963 checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a08e8 @@ -106,7 +74,7 @@ Bird_keeperJose2Script: UnknownScript_0x1a08e8: scall UnknownScript_0x1a095b UnknownScript_0x1a08eb: - askforphonenumber $d + askforphonenumber PHONE_BIRDKEEPER_JOSE if_equal $1, UnknownScript_0x1a096b if_equal $2, UnknownScript_0x1a0967 trainertotext BIRD_KEEPER, JOSE2, $0 @@ -196,23 +164,7 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_BLAKE - - ; trainer group && trainer id - db COOLTRAINERM, BLAKE - - ; text when seen - dw CooltrainermBlakeSeenText - - ; text when trainer beaten - dw CooltrainermBlakeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, $0000, CooltrainermBlakeScript CooltrainermBlakeScript: talkaftercancel @@ -223,23 +175,7 @@ CooltrainermBlakeScript: end TrainerCooltrainermBrian: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_BRIAN - - ; trainer group && trainer id - db COOLTRAINERM, BRIAN - - ; text when seen - dw CooltrainermBrianSeenText - - ; text when trainer beaten - dw CooltrainermBrianBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, $0000, CooltrainermBrianScript CooltrainermBrianScript: talkaftercancel @@ -250,31 +186,15 @@ CooltrainermBrianScript: end TrainerCooltrainerfReena: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_REENA - - ; trainer group && trainer id - db COOLTRAINERF, REENA1 - - ; text when seen - dw CooltrainerfReena1SeenText - - ; text when trainer beaten - dw CooltrainerfReena1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, $0000, CooltrainerfReena1Script CooltrainerfReena1Script: - writecode VAR_CALLERID, $e + writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA talkaftercancel loadfont checkflag ENGINE_REENA iftrue UnknownScript_0x1a09e9 - checkcellnum $e + checkcellnum PHONE_COOLTRAINERF_REENA iftrue UnknownScript_0x1a0a3b checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a09d2 @@ -287,7 +207,7 @@ CooltrainerfReena1Script: UnknownScript_0x1a09d2: scall UnknownScript_0x1a0a33 UnknownScript_0x1a09d5: - askforphonenumber $e + askforphonenumber PHONE_COOLTRAINERF_REENA if_equal $1, UnknownScript_0x1a0a43 if_equal $2, UnknownScript_0x1a0a3f trainertotext COOLTRAINERF, REENA1, $0 @@ -359,23 +279,7 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_MEGAN - - ; trainer group && trainer id - db COOLTRAINERF, MEGAN - - ; text when seen - dw CooltrainerfMeganSeenText - - ; text when trainer beaten - dw CooltrainerfMeganBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, $0000, CooltrainerfMeganScript CooltrainerfMeganScript: talkaftercancel diff --git a/maps/Route3.asm b/maps/Route3.asm index 6b686c4c7..46ad5b651 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -6,23 +6,7 @@ Route3_MapScriptHeader: db 0 TrainerFirebreatherOtis: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_OTIS - - ; trainer group && trainer id - db FIREBREATHER, OTIS - - ; text when seen - dw FirebreatherOtisSeenText - - ; text when trainer beaten - dw FirebreatherOtisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, $0000, FirebreatherOtisScript FirebreatherOtisScript: talkaftercancel @@ -33,23 +17,7 @@ FirebreatherOtisScript: end TrainerYoungsterWarren: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_WARREN - - ; trainer group && trainer id - db YOUNGSTER, WARREN - - ; text when seen - dw YoungsterWarrenSeenText - - ; text when trainer beaten - dw YoungsterWarrenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, $0000, YoungsterWarrenScript YoungsterWarrenScript: talkaftercancel @@ -60,23 +28,7 @@ YoungsterWarrenScript: end TrainerYoungsterJimmy: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JIMMY - - ; trainer group && trainer id - db YOUNGSTER, JIMMY - - ; text when seen - dw YoungsterJimmySeenText - - ; text when trainer beaten - dw YoungsterJimmyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, $0000, YoungsterJimmyScript YoungsterJimmyScript: talkaftercancel @@ -87,23 +39,7 @@ YoungsterJimmyScript: end TrainerFirebreatherBurt: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_BURT - - ; trainer group && trainer id - db FIREBREATHER, BURT - - ; text when seen - dw FirebreatherBurtSeenText - - ; text when trainer beaten - dw FirebreatherBurtBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, $0000, FirebreatherBurtScript FirebreatherBurtScript: talkaftercancel diff --git a/maps/Route30.asm b/maps/Route30.asm index bd7e67a9f..54c42a7f5 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -26,31 +26,15 @@ YoungsterScript_0x1a1673: end TrainerYoungsterJoey: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JOEY - - ; trainer group && trainer id - db YOUNGSTER, JOEY1 - - ; text when seen - dw YoungsterJoey1SeenText - - ; text when trainer beaten - dw YoungsterJoey1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJoey1Script + trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, $0000, YoungsterJoey1Script YoungsterJoey1Script: - writecode VAR_CALLERID, $f + writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY talkaftercancel loadfont checkflag ENGINE_JOEY iftrue UnknownScript_0x1a16e0 - checkcellnum $f + checkcellnum PHONE_YOUNGSTER_JOEY iftrue UnknownScript_0x1a178f checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a16c9 @@ -63,7 +47,7 @@ YoungsterJoey1Script: UnknownScript_0x1a16c9: scall UnknownScript_0x1a1787 UnknownScript_0x1a16cc: - askforphonenumber $f + askforphonenumber PHONE_YOUNGSTER_JOEY if_equal $1, UnknownScript_0x1a1797 if_equal $2, UnknownScript_0x1a1793 trainertotext YOUNGSTER, JOEY1, $0 @@ -189,23 +173,7 @@ UnknownScript_0x1a17a6: end TrainerYoungsterMikey: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_MIKEY - - ; trainer group && trainer id - db YOUNGSTER, MIKEY - - ; text when seen - dw YoungsterMikeySeenText - - ; text when trainer beaten - dw YoungsterMikeyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterMikeyScript + trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, $0000, YoungsterMikeyScript YoungsterMikeyScript: talkaftercancel @@ -216,23 +184,7 @@ YoungsterMikeyScript: end TrainerBug_catcherDon: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_DON - - ; trainer group && trainer id - db BUG_CATCHER, DON - - ; text when seen - dw Bug_catcherDonSeenText - - ; text when trainer beaten - dw Bug_catcherDonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDonScript + trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, $0000, Bug_catcherDonScript Bug_catcherDonScript: talkaftercancel diff --git a/maps/Route31.asm b/maps/Route31.asm index 3deaca873..5866fab1d 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -19,33 +19,17 @@ UnknownScript_0x1a5443: return TrainerBug_catcherWade1: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_WADE - - ; trainer group && trainer id - db BUG_CATCHER, WADE1 - - ; text when seen - dw Bug_catcherWade1SeenText - - ; text when trainer beaten - dw Bug_catcherWade1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherWade1Script + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, $0000, Bug_catcherWade1Script Bug_catcherWade1Script: - writecode VAR_CALLERID, $10 + writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE talkaftercancel loadfont checkflag ENGINE_WADE iftrue UnknownScript_0x1a5493 checkflag ENGINE_WADE_HAS_ITEM iftrue UnknownScript_0x1a5507 - checkcellnum $10 + checkcellnum PHONE_BUG_CATCHER_WADE iftrue UnknownScript_0x1a5558 checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a547c @@ -58,7 +42,7 @@ Bug_catcherWade1Script: UnknownScript_0x1a547c: scall UnknownScript_0x1a5550 UnknownScript_0x1a547f: - askforphonenumber $10 + askforphonenumber PHONE_BUG_CATCHER_WADE if_equal $1, UnknownScript_0x1a5560 if_equal $2, UnknownScript_0x1a555c trainertotext BUG_CATCHER, WADE1, $0 diff --git a/maps/Route32.asm b/maps/Route32.asm index fbfa8ecee..c448dcd23 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -133,23 +133,7 @@ UnknownScript_0x190503: end TrainerCamperRoland: - ; bit/flag number - dw EVENT_BEAT_CAMPER_ROLAND - - ; trainer group && trainer id - db CAMPER, ROLAND - - ; text when seen - dw CamperRolandSeenText - - ; text when trainer beaten - dw CamperRolandBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperRolandScript + trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, $0000, CamperRolandScript CamperRolandScript: talkaftercancel @@ -160,23 +144,7 @@ CamperRolandScript: end TrainerFisherJustin: - ; bit/flag number - dw EVENT_BEAT_FISHER_JUSTIN - - ; trainer group && trainer id - db FISHER, JUSTIN - - ; text when seen - dw FisherJustinSeenText - - ; text when trainer beaten - dw FisherJustinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherJustinScript + trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, $0000, FisherJustinScript FisherJustinScript: talkaftercancel @@ -187,33 +155,17 @@ FisherJustinScript: end TrainerFisherRalph1: - ; bit/flag number - dw EVENT_BEAT_FISHER_RALPH - - ; trainer group && trainer id - db FISHER, RALPH1 - - ; text when seen - dw FisherRalph1SeenText - - ; text when trainer beaten - dw FisherRalph1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherRalph1Script + trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, $0000, FisherRalph1Script FisherRalph1Script: - writecode VAR_CALLERID, $11 + writecode VAR_CALLERID, PHONE_FISHER_RALPH talkaftercancel loadfont checkflag ENGINE_RALPH iftrue UnknownScript_0x19057d checkflag ENGINE_SPECIAL_WILDDATA iftrue UnknownScript_0x1905f1 - checkcellnum $11 + checkcellnum PHONE_FISHER_RALPH iftrue UnknownScript_0x190603 checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x190566 @@ -226,7 +178,7 @@ FisherRalph1Script: UnknownScript_0x190566: scall UnknownScript_0x1905fb UnknownScript_0x190569: - askforphonenumber $11 + askforphonenumber PHONE_FISHER_RALPH if_equal $1, UnknownScript_0x19060b if_equal $2, UnknownScript_0x190607 trainertotext FISHER, RALPH1, $0 @@ -328,23 +280,7 @@ UnknownScript_0x19060f: end TrainerFisherHenry: - ; bit/flag number - dw EVENT_BEAT_FISHER_HENRY - - ; trainer group && trainer id - db FISHER, HENRY - - ; text when seen - dw FisherHenrySeenText - - ; text when trainer beaten - dw FisherHenryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherHenryScript + trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, $0000, FisherHenryScript FisherHenryScript: talkaftercancel @@ -355,31 +291,15 @@ FisherHenryScript: end TrainerPicnickerLiz1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_LIZ - - ; trainer group && trainer id - db PICNICKER, LIZ1 - - ; text when seen - dw PicnickerLiz1SeenText - - ; text when trainer beaten - dw PicnickerLiz1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerLiz1Script + trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, $0000, PicnickerLiz1Script PicnickerLiz1Script: - writecode VAR_CALLERID, $12 + writecode VAR_CALLERID, PHONE_PICNICKER_LIZ talkaftercancel loadfont checkflag ENGINE_LIZ iftrue UnknownScript_0x19066d - checkcellnum $12 + checkcellnum PHONE_PICNICKER_LIZ iftrue UnknownScript_0x1906ed checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x190656 @@ -392,7 +312,7 @@ PicnickerLiz1Script: UnknownScript_0x190656: scall UnknownScript_0x1906e5 UnknownScript_0x190659: - askforphonenumber $12 + askforphonenumber PHONE_PICNICKER_LIZ if_equal $1, UnknownScript_0x1906f5 if_equal $2, UnknownScript_0x1906f1 trainertotext PICNICKER, LIZ1, $0 @@ -488,23 +408,7 @@ UnknownScript_0x1906f9: end TrainerYoungsterAlbert: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_ALBERT - - ; trainer group && trainer id - db YOUNGSTER, ALBERT - - ; text when seen - dw YoungsterAlbertSeenText - - ; text when trainer beaten - dw YoungsterAlbertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterAlbertScript + trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, $0000, YoungsterAlbertScript YoungsterAlbertScript: talkaftercancel @@ -515,23 +419,7 @@ YoungsterAlbertScript: end TrainerYoungsterGordon: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_GORDON - - ; trainer group && trainer id - db YOUNGSTER, GORDON - - ; text when seen - dw YoungsterGordonSeenText - - ; text when trainer beaten - dw YoungsterGordonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterGordonScript + trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, $0000, YoungsterGordonScript YoungsterGordonScript: talkaftercancel @@ -542,23 +430,7 @@ YoungsterGordonScript: end TrainerBird_keeperPeter: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_PETER - - ; trainer group && trainer id - db BIRD_KEEPER, PETER - - ; text when seen - dw Bird_keeperPeterSeenText - - ; text when trainer beaten - dw Bird_keeperPeterBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperPeterScript + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, $0000, Bird_keeperPeterScript Bird_keeperPeterScript: talkaftercancel diff --git a/maps/Route33.asm b/maps/Route33.asm index b3570d918..4b4795143 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -9,33 +9,17 @@ LassScript_0x1ac002: jumptextfaceplayer UnknownText_0x1ac1e7 TrainerHikerAnthony: - ; bit/flag number - dw EVENT_BEAT_HIKER_ANTHONY - - ; trainer group && trainer id - db HIKER, ANTHONY2 - - ; text when seen - dw HikerAnthony2SeenText - - ; text when trainer beaten - dw HikerAnthony2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerAnthony2Script + trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script HikerAnthony2Script: - writecode VAR_CALLERID, $13 + writecode VAR_CALLERID, PHONE_HIKER_ANTHONY talkaftercancel loadfont checkflag ENGINE_ANTHONY iftrue UnknownScript_0x1ac051 checkflag ENGINE_DUNSPARCE_SWARM iftrue UnknownScript_0x1ac0c5 - checkcellnum $13 + checkcellnum PHONE_HIKER_ANTHONY iftrue UnknownScript_0x1ac0d7 checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1ac03a @@ -48,7 +32,7 @@ HikerAnthony2Script: UnknownScript_0x1ac03a: scall UnknownScript_0x1ac0cf UnknownScript_0x1ac03d: - askforphonenumber $13 + askforphonenumber PHONE_HIKER_ANTHONY if_equal $1, UnknownScript_0x1ac0df if_equal $2, UnknownScript_0x1ac0db trainertotext HIKER, ANTHONY2, $0 diff --git a/maps/Route34.asm b/maps/Route34.asm index d8d12e745..677fcecb5 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -76,33 +76,17 @@ DaycareMon2Script_0x7806b: end TrainerCamperTodd1: - ; bit/flag number - dw EVENT_BEAT_CAMPER_TODD - - ; trainer group && trainer id - db CAMPER, TODD1 - - ; text when seen - dw CamperTodd1SeenText - - ; text when trainer beaten - dw CamperTodd1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperTodd1Script + trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, $0000, CamperTodd1Script CamperTodd1Script: - writecode VAR_CALLERID, $14 + writecode VAR_CALLERID, PHONE_CAMPER_TODD talkaftercancel loadfont checkflag ENGINE_TODD iftrue UnknownScript_0x780bd checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue UnknownScript_0x78131 - checkcellnum $14 + checkcellnum PHONE_CAMPER_TODD iftrue UnknownScript_0x78143 checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x780a6 @@ -115,7 +99,7 @@ CamperTodd1Script: UnknownScript_0x780a6: scall UnknownScript_0x7813b UnknownScript_0x780a9: - askforphonenumber $14 + askforphonenumber PHONE_CAMPER_TODD if_equal $1, UnknownScript_0x7814b if_equal $2, UnknownScript_0x78147 trainertotext CAMPER, TODD1, $0 @@ -217,33 +201,17 @@ UnknownScript_0x7814f: end TrainerPicnickerGina1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_GINA - - ; trainer group && trainer id - db PICNICKER, GINA1 - - ; text when seen - dw PicnickerGina1SeenText - - ; text when trainer beaten - dw PicnickerGina1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerGina1Script + trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, $0000, PicnickerGina1Script PicnickerGina1Script: - writecode VAR_CALLERID, $15 + writecode VAR_CALLERID, PHONE_PICNICKER_GINA talkaftercancel loadfont checkflag ENGINE_GINA iftrue UnknownScript_0x7819f checkflag ENGINE_GINA_HAS_LEAF_STONE iftrue UnknownScript_0x78213 - checkcellnum $15 + checkcellnum PHONE_PICNICKER_GINA iftrue UnknownScript_0x78234 checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x78188 @@ -256,7 +224,7 @@ PicnickerGina1Script: UnknownScript_0x78188: scall UnknownScript_0x7822c UnknownScript_0x7818b: - askforphonenumber $15 + askforphonenumber PHONE_PICNICKER_GINA if_equal $1, UnknownScript_0x7823c if_equal $2, UnknownScript_0x78238 trainertotext PICNICKER, GINA1, $0 @@ -402,23 +370,7 @@ UnknownScript_0x78276: end TrainerYoungsterSamuel: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_SAMUEL - - ; trainer group && trainer id - db YOUNGSTER, SAMUEL - - ; text when seen - dw YoungsterSamuelSeenText - - ; text when trainer beaten - dw YoungsterSamuelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterSamuelScript + trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, $0000, YoungsterSamuelScript YoungsterSamuelScript: talkaftercancel @@ -429,23 +381,7 @@ YoungsterSamuelScript: end TrainerYoungsterIan: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_IAN - - ; trainer group && trainer id - db YOUNGSTER, IAN - - ; text when seen - dw YoungsterIanSeenText - - ; text when trainer beaten - dw YoungsterIanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterIanScript + trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, $0000, YoungsterIanScript YoungsterIanScript: talkaftercancel @@ -456,23 +392,7 @@ YoungsterIanScript: end TrainerPokefanmBrandon: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_BRANDON - - ; trainer group && trainer id - db POKEFANM, BRANDON - - ; text when seen - dw PokefanmBrandonSeenText - - ; text when trainer beaten - dw PokefanmBrandonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmBrandonScript + trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, $0000, PokefanmBrandonScript PokefanmBrandonScript: talkaftercancel @@ -483,23 +403,7 @@ PokefanmBrandonScript: end TrainerCooltrainerfIrene: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_IRENE - - ; trainer group && trainer id - db COOLTRAINERF, IRENE - - ; text when seen - dw CooltrainerfIreneSeenText - - ; text when trainer beaten - dw CooltrainerfIreneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfIreneScript + trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, $0000, CooltrainerfIreneScript CooltrainerfIreneScript: talkaftercancel @@ -518,23 +422,7 @@ UnknownScript_0x782d2: end TrainerCooltrainerfJenn: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_JENN - - ; trainer group && trainer id - db COOLTRAINERF, JENN - - ; text when seen - dw CooltrainerfJennSeenText - - ; text when trainer beaten - dw CooltrainerfJennBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfJennScript + trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, $0000, CooltrainerfJennScript CooltrainerfJennScript: talkaftercancel @@ -553,23 +441,7 @@ UnknownScript_0x782f2: end TrainerCooltrainerfKate: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_KATE - - ; trainer group && trainer id - db COOLTRAINERF, KATE - - ; text when seen - dw CooltrainerfKateSeenText - - ; text when trainer beaten - dw CooltrainerfKateBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfKateScript + trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, $0000, CooltrainerfKateScript CooltrainerfKateScript: talkaftercancel diff --git a/maps/Route35.asm b/maps/Route35.asm index 06cebe3ee..fe3304398 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -6,23 +6,7 @@ Route35_MapScriptHeader: db 0 TrainerBird_keeperBryan: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BRYAN - - ; trainer group && trainer id - db BIRD_KEEPER, BRYAN - - ; text when seen - dw Bird_keeperBryanSeenText - - ; text when trainer beaten - dw Bird_keeperBryanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, $0000, Bird_keeperBryanScript Bird_keeperBryanScript: talkaftercancel @@ -33,29 +17,13 @@ Bird_keeperBryanScript: end TrainerJugglerIrwin: - ; bit/flag number - dw EVENT_BEAT_JUGGLER_IRWIN - - ; trainer group && trainer id - db JUGGLER, IRWIN1 - - ; text when seen - dw JugglerIrwin1SeenText - - ; text when trainer beaten - dw JugglerIrwin1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, $0000, JugglerIrwin1Script JugglerIrwin1Script: - writecode VAR_CALLERID, $16 + writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN talkaftercancel loadfont - checkcellnum $16 + checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c8ec @@ -68,7 +36,7 @@ JugglerIrwin1Script: UnknownScript_0x19c8ec: scall UnknownScript_0x19c907 UnknownScript_0x19c8ef: - askforphonenumber $16 + askforphonenumber PHONE_JUGGLER_IRWIN if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext JUGGLER, IRWIN1, $0 @@ -104,23 +72,7 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - ; bit/flag number - dw EVENT_BEAT_CAMPER_IVAN - - ; trainer group && trainer id - db CAMPER, IVAN - - ; text when seen - dw CamperIvanSeenText - - ; text when trainer beaten - dw CamperIvanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, $0000, CamperIvanScript CamperIvanScript: talkaftercancel @@ -131,23 +83,7 @@ CamperIvanScript: end TrainerCamperElliot: - ; bit/flag number - dw EVENT_BEAT_CAMPER_ELLIOT - - ; trainer group && trainer id - db CAMPER, ELLIOT - - ; text when seen - dw CamperElliotSeenText - - ; text when trainer beaten - dw CamperElliotBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, $0000, CamperElliotScript CamperElliotScript: talkaftercancel @@ -158,23 +94,7 @@ CamperElliotScript: end TrainerPicnickerBrooke: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_BROOKE - - ; trainer group && trainer id - db PICNICKER, BROOKE - - ; text when seen - dw PicnickerBrookeSeenText - - ; text when trainer beaten - dw PicnickerBrookeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, $0000, PicnickerBrookeScript PicnickerBrookeScript: talkaftercancel @@ -185,23 +105,7 @@ PicnickerBrookeScript: end TrainerPicnickerKim: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_KIM - - ; trainer group && trainer id - db PICNICKER, KIM - - ; text when seen - dw PicnickerKimSeenText - - ; text when trainer beaten - dw PicnickerKimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, $0000, PicnickerKimScript PicnickerKimScript: talkaftercancel @@ -212,33 +116,17 @@ PicnickerKimScript: end TrainerBug_catcherArnie1: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ARNIE - - ; trainer group && trainer id - db BUG_CATCHER, ARNIE1 - - ; text when seen - dw Bug_catcherArnie1SeenText - - ; text when trainer beaten - dw Bug_catcherArnie1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, $0000, Bug_catcherArnie1Script Bug_catcherArnie1Script: - writecode VAR_CALLERID, $17 + writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE talkaftercancel loadfont checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb checkflag ENGINE_YANMA_SWARM iftrue UnknownScript_0x19ca2f - checkcellnum $17 + checkcellnum PHONE_BUG_CATCHER_ARNIE iftrue UnknownScript_0x19c90f checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c9a4 @@ -251,7 +139,7 @@ Bug_catcherArnie1Script: UnknownScript_0x19c9a4: scall UnknownScript_0x19c907 UnknownScript_0x19c9a7: - askforphonenumber $17 + askforphonenumber PHONE_BUG_CATCHER_ARNIE if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext BUG_CATCHER, ARNIE1, $0 @@ -325,23 +213,7 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_WALT - - ; trainer group && trainer id - db FIREBREATHER, WALT - - ; text when seen - dw FirebreatherWaltSeenText - - ; text when trainer beaten - dw FirebreatherWaltBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, $0000, FirebreatherWaltScript FirebreatherWaltScript: talkaftercancel diff --git a/maps/Route36.asm b/maps/Route36.asm index 62de1e170..888393c0d 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -162,33 +162,17 @@ UnknownScript_0x1940ee: end TrainerSchoolboyAlan1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_ALAN - - ; trainer group && trainer id - db SCHOOLBOY, ALAN1 - - ; text when seen - dw SchoolboyAlan1SeenText - - ; text when trainer beaten - dw SchoolboyAlan1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyAlan1Script + trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, $0000, SchoolboyAlan1Script SchoolboyAlan1Script: - writecode VAR_CALLERID, $18 + writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN talkaftercancel loadfont checkflag ENGINE_ALAN iftrue UnknownScript_0x194140 checkflag ENGINE_ALAN_HAS_FIRE_STONE iftrue UnknownScript_0x1941b4 - checkcellnum $18 + checkcellnum PHONE_SCHOOLBOY_ALAN iftrue UnknownScript_0x1941d5 checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x194129 @@ -201,7 +185,7 @@ SchoolboyAlan1Script: UnknownScript_0x194129: scall UnknownScript_0x1941cd UnknownScript_0x19412c: - askforphonenumber $18 + askforphonenumber PHONE_SCHOOLBOY_ALAN if_equal $1, UnknownScript_0x1941dd if_equal $2, UnknownScript_0x1941d9 trainertotext SCHOOLBOY, ALAN1, $0 @@ -316,23 +300,7 @@ UnknownScript_0x1941e9: end TrainerPsychicMark: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_MARK - - ; trainer group && trainer id - db PSYCHIC_T, MARK - - ; text when seen - dw PsychicMarkSeenText - - ; text when trainer beaten - dw PsychicMarkBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicMarkScript + trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, $0000, PsychicMarkScript PsychicMarkScript: talkaftercancel diff --git a/maps/Route37.asm b/maps/Route37.asm index f82c23ccd..66873003b 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -20,23 +20,7 @@ SunnyCallback: return TrainerTwinsAnnandanne1: - ; bit/flag number - dw EVENT_BEAT_TWINS_ANN_AND_ANNE - - ; trainer group && trainer id - db TWINS, ANNANDANNE1 - - ; text when seen - dw TwinsAnnandanne1SeenText - - ; text when trainer beaten - dw TwinsAnnandanne1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, $0000, TwinsAnnandanne1Script TwinsAnnandanne1Script: talkaftercancel @@ -47,23 +31,7 @@ TwinsAnnandanne1Script: end TrainerTwinsAnnandanne2: - ; bit/flag number - dw EVENT_BEAT_TWINS_ANN_AND_ANNE - - ; trainer group && trainer id - db TWINS, ANNANDANNE2 - - ; text when seen - dw TwinsAnnandanne2SeenText - - ; text when trainer beaten - dw TwinsAnnandanne2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, $0000, TwinsAnnandanne2Script TwinsAnnandanne2Script: talkaftercancel @@ -74,23 +42,7 @@ TwinsAnnandanne2Script: end TrainerPsychicGreg: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_GREG - - ; trainer group && trainer id - db PSYCHIC_T, GREG - - ; text when seen - dw PsychicGregSeenText - - ; text when trainer beaten - dw PsychicGregBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, $0000, PsychicGregScript PsychicGregScript: talkaftercancel diff --git a/maps/Route38.asm b/maps/Route38.asm index a810f8b7c..c456c277f 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -6,23 +6,7 @@ Route38_MapScriptHeader: db 0 TrainerBird_keeperToby: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_TOBY - - ; trainer group && trainer id - db BIRD_KEEPER, TOBY - - ; text when seen - dw Bird_keeperTobySeenText - - ; text when trainer beaten - dw Bird_keeperTobyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperTobyScript + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, $0000, Bird_keeperTobyScript Bird_keeperTobyScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperTobyScript: end TrainerSailorHarry: - ; bit/flag number - dw EVENT_BEAT_SAILOR_HARRY - - ; trainer group && trainer id - db SAILOR, HARRY - - ; text when seen - dw SailorHarrySeenText - - ; text when trainer beaten - dw SailorHarryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorHarryScript + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, $0000, SailorHarryScript SailorHarryScript: talkaftercancel @@ -60,33 +28,17 @@ SailorHarryScript: end TrainerLassDana1: - ; bit/flag number - dw EVENT_BEAT_LASS_DANA - - ; trainer group && trainer id - db LASS, DANA1 - - ; text when seen - dw LassDana1SeenText - - ; text when trainer beaten - dw LassDana1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassDana1Script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, $0000, LassDana1Script LassDana1Script: - writecode VAR_CALLERID, $1a + writecode VAR_CALLERID, PHONE_LASS_DANA talkaftercancel loadfont checkflag ENGINE_DANA iftrue UnknownScript_0x1a1d82 checkflag ENGINE_LIZ_HAS_THUNDERSTONE iftrue UnknownScript_0x1a1df6 - checkcellnum $1a + checkcellnum PHONE_LASS_DANA iftrue UnknownScript_0x1a1e17 checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a1d6b @@ -99,7 +51,7 @@ LassDana1Script: UnknownScript_0x1a1d6b: scall UnknownScript_0x1a1e0f UnknownScript_0x1a1d6e: - askforphonenumber $1a + askforphonenumber PHONE_LASS_DANA if_equal $1, UnknownScript_0x1a1e1f if_equal $2, UnknownScript_0x1a1e1b trainertotext LASS, DANA1, $0 @@ -214,31 +166,15 @@ UnknownScript_0x1a1e2b: end TrainerSchoolboyChad1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_CHAD - - ; trainer group && trainer id - db SCHOOLBOY, CHAD1 - - ; text when seen - dw SchoolboyChad1SeenText - - ; text when trainer beaten - dw SchoolboyChad1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyChad1Script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, $0000, SchoolboyChad1Script SchoolboyChad1Script: - writecode VAR_CALLERID, $1b + writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD talkaftercancel loadfont checkflag ENGINE_CHAD iftrue UnknownScript_0x1a1e75 - checkcellnum $1b + checkcellnum PHONE_SCHOOLBOY_CHAD iftrue UnknownScript_0x1a1ef5 checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a1e5e @@ -251,7 +187,7 @@ SchoolboyChad1Script: UnknownScript_0x1a1e5e: scall UnknownScript_0x1a1eed UnknownScript_0x1a1e61: - askforphonenumber $1b + askforphonenumber PHONE_SCHOOLBOY_CHAD if_equal $1, UnknownScript_0x1a1efd if_equal $2, UnknownScript_0x1a1ef9 trainertotext SCHOOLBOY, CHAD1, $0 @@ -347,23 +283,7 @@ UnknownScript_0x1a1f01: end TrainerBeautyValerie: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_VALERIE - - ; trainer group && trainer id - db BEAUTY, VALERIE - - ; text when seen - dw BeautyValerieSeenText - - ; text when trainer beaten - dw BeautyValerieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyValerieScript + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, $0000, BeautyValerieScript BeautyValerieScript: talkaftercancel @@ -374,23 +294,7 @@ BeautyValerieScript: end TrainerBeautyOlivia: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_OLIVIA - - ; trainer group && trainer id - db BEAUTY, OLIVIA - - ; text when seen - dw BeautyOliviaSeenText - - ; text when trainer beaten - dw BeautyOliviaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyOliviaScript + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, $0000, BeautyOliviaScript BeautyOliviaScript: talkaftercancel diff --git a/maps/Route39.asm b/maps/Route39.asm index 34f56bb3e..34805ddc8 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -14,31 +14,15 @@ TaurosScript_0x1a5af5: end TrainerPokefanmDerek1: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_DEREK - - ; trainer group && trainer id - db POKEFANM, DEREK1 - - ; text when seen - dw PokefanmDerek1SeenText - - ; text when trainer beaten - dw PokefanmDerek1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, $0000, PokefanmDerek1Script PokefanmDerek1Script: - writecode VAR_CALLERID, $1c + writecode VAR_CALLERID, PHONE_POKEFANM_DEREK talkaftercancel loadfont checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0x1a5b4a - checkcellnum $1c + checkcellnum PHONE_POKEFANM_DEREK iftrue UnknownScript_0x1a5b6e checkpoke PIKACHU iffalse UnknownScript_0x1a5b5c @@ -53,7 +37,7 @@ PokefanmDerek1Script: UnknownScript_0x1a5b33: scall UnknownScript_0x1a5b66 UnknownScript_0x1a5b36: - askforphonenumber $1c + askforphonenumber PHONE_POKEFANM_DEREK if_equal $1, UnknownScript_0x1a5b76 if_equal $2, UnknownScript_0x1a5b72 trainertotext POKEFANM, DEREK1, $0 @@ -109,23 +93,7 @@ UnknownScript_0x1a5b7e: end TrainerPokefanfRuth: - ; bit/flag number - dw EVENT_BEAT_POKEFANF_RUTH - - ; trainer group && trainer id - db POKEFANF, RUTH - - ; text when seen - dw PokefanfRuthSeenText - - ; text when trainer beaten - dw PokefanfRuthBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, $0000, PokefanfRuthScript PokefanfRuthScript: talkaftercancel @@ -136,23 +104,7 @@ PokefanfRuthScript: end TrainerSailorEugene: - ; bit/flag number - dw EVENT_BEAT_SAILOR_EUGENE - - ; trainer group && trainer id - db SAILOR, EUGENE - - ; text when seen - dw SailorEugeneSeenText - - ; text when trainer beaten - dw SailorEugeneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, $0000, SailorEugeneScript SailorEugeneScript: talkaftercancel @@ -163,23 +115,7 @@ SailorEugeneScript: end TrainerPsychicNorman: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_NORMAN - - ; trainer group && trainer id - db PSYCHIC_T, NORMAN - - ; text when seen - dw PsychicNormanSeenText - - ; text when trainer beaten - dw PsychicNormanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, $0000, PsychicNormanScript PsychicNormanScript: talkaftercancel diff --git a/maps/Route4.asm b/maps/Route4.asm index 66265bba5..4bfcace93 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -6,23 +6,7 @@ Route4_MapScriptHeader: db 0 TrainerBird_keeperHank: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_HANK - - ; trainer group && trainer id - db BIRD_KEEPER, HANK - - ; text when seen - dw Bird_keeperHankSeenText - - ; text when trainer beaten - dw Bird_keeperHankBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, $0000, Bird_keeperHankScript Bird_keeperHankScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperHankScript: end TrainerPicnickerHope: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_HOPE - - ; trainer group && trainer id - db PICNICKER, HOPE - - ; text when seen - dw PicnickerHopeSeenText - - ; text when trainer beaten - dw PicnickerHopeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, $0000, PicnickerHopeScript PicnickerHopeScript: talkaftercancel @@ -60,23 +28,7 @@ PicnickerHopeScript: end TrainerPicnickerSharon: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_SHARON - - ; trainer group && trainer id - db PICNICKER, SHARON - - ; text when seen - dw PicnickerSharonSeenText - - ; text when trainer beaten - dw PicnickerSharonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, $0000, PicnickerSharonScript PicnickerSharonScript: talkaftercancel diff --git a/maps/Route40.asm b/maps/Route40.asm index b326ca0ef..65c8e188f 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -21,23 +21,7 @@ MonicaCallback: return TrainerSwimmerfElaine: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_ELAINE - - ; trainer group && trainer id - db SWIMMERF, ELAINE - - ; text when seen - dw SwimmerfElaineSeenText - - ; text when trainer beaten - dw SwimmerfElaineBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript SwimmerfElaineScript: talkaftercancel @@ -48,23 +32,7 @@ SwimmerfElaineScript: end TrainerSwimmerfPaula: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_PAULA - - ; trainer group && trainer id - db SWIMMERF, PAULA - - ; text when seen - dw SwimmerfPaulaSeenText - - ; text when trainer beaten - dw SwimmerfPaulaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript SwimmerfPaulaScript: talkaftercancel @@ -75,23 +43,7 @@ SwimmerfPaulaScript: end TrainerSwimmermSimon: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_SIMON - - ; trainer group && trainer id - db SWIMMERM, SIMON - - ; text when seen - dw SwimmermSimonSeenText - - ; text when trainer beaten - dw SwimmermSimonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript SwimmermSimonScript: talkaftercancel @@ -102,23 +54,7 @@ SwimmermSimonScript: end TrainerSwimmermRandall: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_RANDALL - - ; trainer group && trainer id - db SWIMMERM, RANDALL - - ; text when seen - dw SwimmermRandallSeenText - - ; text when trainer beaten - dw SwimmermRandallBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript SwimmermRandallScript: talkaftercancel diff --git a/maps/Route41.asm b/maps/Route41.asm index aff5462ef..7f97924da 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -6,23 +6,7 @@ Route41_MapScriptHeader: db 0 TrainerSwimmerfKaylee: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_KAYLEE - - ; trainer group && trainer id - db SWIMMERF, KAYLEE - - ; text when seen - dw SwimmerfKayleeSeenText - - ; text when trainer beaten - dw SwimmerfKayleeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, $0000, SwimmerfKayleeScript SwimmerfKayleeScript: talkaftercancel @@ -33,23 +17,7 @@ SwimmerfKayleeScript: end TrainerSwimmerfSusie: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_SUSIE - - ; trainer group && trainer id - db SWIMMERF, SUSIE - - ; text when seen - dw SwimmerfSusieSeenText - - ; text when trainer beaten - dw SwimmerfSusieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, $0000, SwimmerfSusieScript SwimmerfSusieScript: talkaftercancel @@ -60,23 +28,7 @@ SwimmerfSusieScript: end TrainerSwimmerfDenise: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_DENISE - - ; trainer group && trainer id - db SWIMMERF, DENISE - - ; text when seen - dw SwimmerfDeniseSeenText - - ; text when trainer beaten - dw SwimmerfDeniseBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, $0000, SwimmerfDeniseScript SwimmerfDeniseScript: talkaftercancel @@ -87,23 +39,7 @@ SwimmerfDeniseScript: end TrainerSwimmerfKara: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_KARA - - ; trainer group && trainer id - db SWIMMERF, KARA - - ; text when seen - dw SwimmerfKaraSeenText - - ; text when trainer beaten - dw SwimmerfKaraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, $0000, SwimmerfKaraScript SwimmerfKaraScript: talkaftercancel @@ -114,23 +50,7 @@ SwimmerfKaraScript: end TrainerSwimmerfWendy: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_WENDY - - ; trainer group && trainer id - db SWIMMERF, WENDY - - ; text when seen - dw SwimmerfWendySeenText - - ; text when trainer beaten - dw SwimmerfWendyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, $0000, SwimmerfWendyScript SwimmerfWendyScript: talkaftercancel @@ -141,23 +61,7 @@ SwimmerfWendyScript: end TrainerSwimmermCharlie: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_CHARLIE - - ; trainer group && trainer id - db SWIMMERM, CHARLIE - - ; text when seen - dw SwimmermCharlieSeenText - - ; text when trainer beaten - dw SwimmermCharlieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, $0000, SwimmermCharlieScript SwimmermCharlieScript: talkaftercancel @@ -168,23 +72,7 @@ SwimmermCharlieScript: end TrainerSwimmermGeorge: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_GEORGE - - ; trainer group && trainer id - db SWIMMERM, GEORGE - - ; text when seen - dw SwimmermGeorgeSeenText - - ; text when trainer beaten - dw SwimmermGeorgeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, $0000, SwimmermGeorgeScript SwimmermGeorgeScript: talkaftercancel @@ -195,23 +83,7 @@ SwimmermGeorgeScript: end TrainerSwimmermBerke: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_BERKE - - ; trainer group && trainer id - db SWIMMERM, BERKE - - ; text when seen - dw SwimmermBerkeSeenText - - ; text when trainer beaten - dw SwimmermBerkeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, $0000, SwimmermBerkeScript SwimmermBerkeScript: talkaftercancel @@ -222,23 +94,7 @@ SwimmermBerkeScript: end TrainerSwimmermKirk: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_KIRK - - ; trainer group && trainer id - db SWIMMERM, KIRK - - ; text when seen - dw SwimmermKirkSeenText - - ; text when trainer beaten - dw SwimmermKirkBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, $0000, SwimmermKirkScript SwimmermKirkScript: talkaftercancel @@ -249,23 +105,7 @@ SwimmermKirkScript: end TrainerSwimmermMathew: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_MATHEW - - ; trainer group && trainer id - db SWIMMERM, MATHEW - - ; text when seen - dw SwimmermMathewSeenText - - ; text when trainer beaten - dw SwimmermMathewBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, $0000, SwimmermMathewScript SwimmermMathewScript: talkaftercancel diff --git a/maps/Route42.asm b/maps/Route42.asm index c241a5a1e..09d47a465 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -28,33 +28,17 @@ UnknownScript_0x1a9218: end TrainerFisherTully1: - ; bit/flag number - dw EVENT_BEAT_FISHER_TULLY - - ; trainer group && trainer id - db FISHER, TULLY1 - - ; text when seen - dw FisherTully1SeenText - - ; text when trainer beaten - dw FisherTully1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, $0000, FisherTully1Script FisherTully1Script: - writecode VAR_CALLERID, $1d + writecode VAR_CALLERID, PHONE_FISHER_TULLY talkaftercancel loadfont checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue UnknownScript_0x1a92dc - checkcellnum $1d + checkcellnum PHONE_FISHER_TULLY iftrue UnknownScript_0x1a92fd checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a9268 @@ -67,7 +51,7 @@ FisherTully1Script: UnknownScript_0x1a9268: scall UnknownScript_0x1a92f5 UnknownScript_0x1a926b: - askforphonenumber $1d + askforphonenumber PHONE_FISHER_TULLY if_equal $1, UnknownScript_0x1a9305 if_equal $2, UnknownScript_0x1a9301 trainertotext FISHER, TULLY1, $0 @@ -170,23 +154,7 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_SHANE - - ; trainer group && trainer id - db POKEMANIAC, SHANE - - ; text when seen - dw PokemaniacShaneSeenText - - ; text when trainer beaten - dw PokemaniacShaneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, $0000, PokemaniacShaneScript PokemaniacShaneScript: talkaftercancel @@ -197,23 +165,7 @@ PokemaniacShaneScript: end TrainerHikerBenjamin: - ; bit/flag number - dw EVENT_BEAT_HIKER_BENJAMIN - - ; trainer group && trainer id - db HIKER, BENJAMIN - - ; text when seen - dw HikerBenjaminSeenText - - ; text when trainer beaten - dw HikerBenjaminBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, $0000, HikerBenjaminScript HikerBenjaminScript: talkaftercancel diff --git a/maps/Route43.asm b/maps/Route43.asm index d2d30fe3d..75c3e28fd 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -20,23 +20,7 @@ UnknownScript_0x19d05c: return TrainerCamperSpencer: - ; bit/flag number - dw EVENT_BEAT_CAMPER_SPENCER - - ; trainer group && trainer id - db CAMPER, SPENCER - - ; text when seen - dw CamperSpencerSeenText - - ; text when trainer beaten - dw CamperSpencerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, $0000, CamperSpencerScript CamperSpencerScript: talkaftercancel @@ -47,23 +31,7 @@ CamperSpencerScript: end TrainerPokemaniacBen: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_BEN - - ; trainer group && trainer id - db POKEMANIAC, BEN - - ; text when seen - dw PokemaniacBenSeenText - - ; text when trainer beaten - dw PokemaniacBenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, $0000, PokemaniacBenScript PokemaniacBenScript: talkaftercancel @@ -74,31 +42,15 @@ PokemaniacBenScript: end TrainerPokemaniacBrent1: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_BRENT - - ; trainer group && trainer id - db POKEMANIAC, BRENT1 - - ; text when seen - dw PokemaniacBrent1SeenText - - ; text when trainer beaten - dw PokemaniacBrent1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, $0000, PokemaniacBrent1Script PokemaniacBrent1Script: - writecode VAR_CALLERID, $1e + writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT talkaftercancel loadfont checkflag ENGINE_BRENT iftrue UnknownScript_0x19d0cf - checkcellnum $1e + checkcellnum PHONE_POKEMANIAC_BRENT iftrue UnknownScript_0x19d138 checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d0b8 @@ -111,7 +63,7 @@ PokemaniacBrent1Script: UnknownScript_0x19d0b8: scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: - askforphonenumber $1e + askforphonenumber PHONE_POKEMANIAC_BRENT if_equal $1, UnknownScript_0x19d140 if_equal $2, UnknownScript_0x19d13c trainertotext POKEMANIAC, BRENT1, $0 @@ -195,23 +147,7 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_RON - - ; trainer group && trainer id - db POKEMANIAC, RON - - ; text when seen - dw PokemaniacRonSeenText - - ; text when trainer beaten - dw PokemaniacRonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, $0000, PokemaniacRonScript PokemaniacRonScript: talkaftercancel @@ -222,23 +158,7 @@ PokemaniacRonScript: end TrainerFisherMarvin: - ; bit/flag number - dw EVENT_BEAT_FISHER_MARVIN - - ; trainer group && trainer id - db FISHER, MARVIN - - ; text when seen - dw FisherMarvinSeenText - - ; text when trainer beaten - dw FisherMarvinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, $0000, FisherMarvinScript FisherMarvinScript: talkaftercancel @@ -249,33 +169,17 @@ FisherMarvinScript: end TrainerPicnickerTiffany3: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_TIFFANY - - ; trainer group && trainer id - db PICNICKER, TIFFANY3 - - ; text when seen - dw PicnickerTiffany3SeenText - - ; text when trainer beaten - dw PicnickerTiffany3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, $0000, PicnickerTiffany3Script PicnickerTiffany3Script: - writecode VAR_CALLERID, $1f + writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY talkaftercancel loadfont checkflag ENGINE_TIFFANY iftrue UnknownScript_0x19d1c1 checkflag ENGINE_TIFFANY_HAS_PINK_BOW iftrue UnknownScript_0x19d21e - checkcellnum $1f + checkcellnum PHONE_PICNICKER_TIFFANY iftrue UnknownScript_0x19d245 checkpoke CLEFAIRY iffalse UnknownScript_0x19d233 @@ -290,7 +194,7 @@ PicnickerTiffany3Script: UnknownScript_0x19d1aa: scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: - askforphonenumber $1f + askforphonenumber PHONE_PICNICKER_TIFFANY if_equal $1, UnknownScript_0x19d24d if_equal $2, UnknownScript_0x19d249 trainertotext PICNICKER, TIFFANY3, $0 diff --git a/maps/Route44.asm b/maps/Route44.asm index 74e491192..3c48986c5 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -6,31 +6,15 @@ Route44_MapScriptHeader: db 0 TrainerBird_keeperVance1: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_VANCE - - ; trainer group && trainer id - db BIRD_KEEPER, VANCE1 - - ; text when seen - dw Bird_keeperVance1SeenText - - ; text when trainer beaten - dw Bird_keeperVance1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, $0000, Bird_keeperVance1Script Bird_keeperVance1Script: - writecode VAR_CALLERID, $20 + writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE talkaftercancel loadfont checkflag ENGINE_VANCE iftrue UnknownScript_0x19d86a - checkcellnum $20 + checkcellnum PHONE_BIRDKEEPER_VANCE iftrue UnknownScript_0x19d8eb checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d853 @@ -43,7 +27,7 @@ Bird_keeperVance1Script: UnknownScript_0x19d853: scall UnknownScript_0x19d8e3 UnknownScript_0x19d856: - askforphonenumber $20 + askforphonenumber PHONE_BIRDKEEPER_VANCE if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext BIRD_KEEPER, VANCE1, $0 @@ -153,23 +137,7 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_PHIL - - ; trainer group && trainer id - db PSYCHIC_T, PHIL - - ; text when seen - dw PsychicPhilSeenText - - ; text when trainer beaten - dw PsychicPhilBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, $0000, PsychicPhilScript PsychicPhilScript: talkaftercancel @@ -180,33 +148,17 @@ PsychicPhilScript: end TrainerFisherWilton1: - ; bit/flag number - dw EVENT_BEAT_FISHER_WILTON - - ; trainer group && trainer id - db FISHER, WILTON1 - - ; text when seen - dw FisherWilton1SeenText - - ; text when trainer beaten - dw FisherWilton1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, $0000, FisherWilton1Script FisherWilton1Script: - writecode VAR_CALLERID, $21 + writecode VAR_CALLERID, PHONE_FISHER_WILTON talkaftercancel loadfont checkflag ENGINE_WILTON iftrue UnknownScript_0x19d96e checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0x19d9b4 - checkcellnum $21 + checkcellnum PHONE_FISHER_WILTON iftrue UnknownScript_0x19d8eb checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d957 @@ -219,7 +171,7 @@ FisherWilton1Script: UnknownScript_0x19d957: scall UnknownScript_0x19d8e3 UnknownScript_0x19d95a: - askforphonenumber $21 + askforphonenumber PHONE_FISHER_WILTON if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext FISHER, WILTON1, $0 @@ -291,23 +243,7 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - ; bit/flag number - dw EVENT_BEAT_FISHER_EDGAR - - ; trainer group && trainer id - db FISHER, EDGAR - - ; text when seen - dw FisherEdgarSeenText - - ; text when trainer beaten - dw FisherEdgarBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, $0000, FisherEdgarScript FisherEdgarScript: talkaftercancel @@ -318,23 +254,7 @@ FisherEdgarScript: end TrainerCooltrainerfCybil: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_CYBIL - - ; trainer group && trainer id - db COOLTRAINERF, CYBIL - - ; text when seen - dw CooltrainerfCybilSeenText - - ; text when trainer beaten - dw CooltrainerfCybilBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, $0000, CooltrainerfCybilScript CooltrainerfCybilScript: talkaftercancel @@ -345,23 +265,7 @@ CooltrainerfCybilScript: end TrainerPokemaniacZach: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ZACH - - ; trainer group && trainer id - db POKEMANIAC, ZACH - - ; text when seen - dw PokemaniacZachSeenText - - ; text when trainer beaten - dw PokemaniacZachBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, $0000, PokemaniacZachScript PokemaniacZachScript: talkaftercancel @@ -372,23 +276,7 @@ PokemaniacZachScript: end TrainerCooltrainermAllen: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_ALLEN - - ; trainer group && trainer id - db COOLTRAINERM, ALLEN - - ; text when seen - dw CooltrainermAllenSeenText - - ; text when trainer beaten - dw CooltrainermAllenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, $0000, CooltrainermAllenScript CooltrainermAllenScript: talkaftercancel diff --git a/maps/Route45.asm b/maps/Route45.asm index 7057ccbf9..e51855f14 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -6,29 +6,13 @@ Route45_MapScriptHeader: db 0 TrainerBlackbeltKenji: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_KENJI - - ; trainer group && trainer id - db BLACKBELT_T, KENJI3 - - ; text when seen - dw BlackbeltKenji3SeenText - - ; text when trainer beaten - dw BlackbeltKenji3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, $0000, BlackbeltKenji3Script BlackbeltKenji3Script: - writecode VAR_CALLERID, $22 + writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI talkaftercancel loadfont - checkcellnum $22 + checkcellnum PHONE_BLACKBELT_KENJI iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e0cd @@ -42,7 +26,7 @@ BlackbeltKenji3Script: UnknownScript_0x19e0cd: scall UnknownScript_0x19e11f UnknownScript_0x19e0d0: - askforphonenumber $22 + askforphonenumber PHONE_BLACKBELT_KENJI if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext BLACKBELT_T, KENJI3, $0 @@ -126,23 +110,7 @@ UnknownScript_0x19e146: end TrainerHikerErik: - ; bit/flag number - dw EVENT_BEAT_HIKER_ERIK - - ; trainer group && trainer id - db HIKER, ERIK - - ; text when seen - dw HikerErikSeenText - - ; text when trainer beaten - dw HikerErikBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, $0000, HikerErikScript HikerErikScript: talkaftercancel @@ -153,23 +121,7 @@ HikerErikScript: end TrainerHikerMichael: - ; bit/flag number - dw EVENT_BEAT_HIKER_MICHAEL - - ; trainer group && trainer id - db HIKER, MICHAEL - - ; text when seen - dw HikerMichaelSeenText - - ; text when trainer beaten - dw HikerMichaelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, $0000, HikerMichaelScript HikerMichaelScript: talkaftercancel @@ -180,31 +132,15 @@ HikerMichaelScript: end TrainerHikerParry: - ; bit/flag number - dw EVENT_BEAT_HIKER_PARRY - - ; trainer group && trainer id - db HIKER, PARRY3 - - ; text when seen - dw HikerParry3SeenText - - ; text when trainer beaten - dw HikerParry3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, $0000, HikerParry3Script HikerParry3Script: - writecode VAR_CALLERID, $23 + writecode VAR_CALLERID, PHONE_HIKER_PARRY talkaftercancel loadfont checkflag ENGINE_PARRY iftrue UnknownScript_0x19e1b8 - checkcellnum $23 + checkcellnum PHONE_HIKER_PARRY iftrue UnknownScript_0x19e127 checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e1a1 @@ -217,7 +153,7 @@ HikerParry3Script: UnknownScript_0x19e1a1: scall UnknownScript_0x19e11f UnknownScript_0x19e1a4: - askforphonenumber $23 + askforphonenumber PHONE_HIKER_PARRY if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext HIKER, PARRY1, $0 @@ -282,23 +218,7 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - ; bit/flag number - dw EVENT_BEAT_HIKER_TIMOTHY - - ; trainer group && trainer id - db HIKER, TIMOTHY - - ; text when seen - dw HikerTimothySeenText - - ; text when trainer beaten - dw HikerTimothyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, $0000, HikerTimothyScript HikerTimothyScript: talkaftercancel @@ -309,23 +229,7 @@ HikerTimothyScript: end TrainerCooltrainermRyan: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_RYAN - - ; trainer group && trainer id - db COOLTRAINERM, RYAN - - ; text when seen - dw CooltrainermRyanSeenText - - ; text when trainer beaten - dw CooltrainermRyanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, $0000, CooltrainermRyanScript CooltrainermRyanScript: talkaftercancel @@ -336,23 +240,7 @@ CooltrainermRyanScript: end TrainerCooltrainerfKelly: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_KELLY - - ; trainer group && trainer id - db COOLTRAINERF, KELLY - - ; text when seen - dw CooltrainerfKellySeenText - - ; text when trainer beaten - dw CooltrainerfKellyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, $0000, CooltrainerfKellyScript CooltrainerfKellyScript: talkaftercancel diff --git a/maps/Route46.asm b/maps/Route46.asm index 105bfbd96..96c04b960 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -6,23 +6,7 @@ Route46_MapScriptHeader: db 0 TrainerCamperTed: - ; bit/flag number - dw EVENT_BEAT_CAMPER_TED - - ; trainer group && trainer id - db CAMPER, TED - - ; text when seen - dw CamperTedSeenText - - ; text when trainer beaten - dw CamperTedBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, $0000, CamperTedScript CamperTedScript: talkaftercancel @@ -33,31 +17,15 @@ CamperTedScript: end TrainerPicnickerErin1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_ERIN - - ; trainer group && trainer id - db PICNICKER, ERIN1 - - ; text when seen - dw PicnickerErin1SeenText - - ; text when trainer beaten - dw PicnickerErin1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, $0000, PicnickerErin1Script PicnickerErin1Script: - writecode VAR_CALLERID, $24 + writecode VAR_CALLERID, PHONE_PICNICKER_ERIN talkaftercancel loadfont checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da - checkcellnum $24 + checkcellnum PHONE_PICNICKER_ERIN iftrue UnknownScript_0x1a975b checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a96c3 @@ -70,7 +38,7 @@ PicnickerErin1Script: UnknownScript_0x1a96c3: scall UnknownScript_0x1a9753 UnknownScript_0x1a96c6: - askforphonenumber $24 + askforphonenumber PHONE_PICNICKER_ERIN if_equal $1, UnknownScript_0x1a9763 if_equal $2, UnknownScript_0x1a975f trainertotext PICNICKER, ERIN1, $0 @@ -172,23 +140,7 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - ; bit/flag number - dw EVENT_BEAT_HIKER_BAILEY - - ; trainer group && trainer id - db HIKER, BAILEY - - ; text when seen - dw HikerBaileySeenText - - ; text when trainer beaten - dw HikerBaileyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, $0000, HikerBaileyScript HikerBaileyScript: talkaftercancel diff --git a/maps/Route6.asm b/maps/Route6.asm index e3522e22a..6f3c1bc37 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -6,23 +6,7 @@ Route6_MapScriptHeader: db 0 TrainerPokefanmRex: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_REX - - ; trainer group && trainer id - db POKEFANM, REX - - ; text when seen - dw PokefanmRexSeenText - - ; text when trainer beaten - dw PokefanmRexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript PokefanmRexScript: talkaftercancel @@ -33,23 +17,7 @@ PokefanmRexScript: end TrainerPokefanmAllan: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ALLAN - - ; trainer group && trainer id - db POKEFANM, ALLAN - - ; text when seen - dw PokefanmAllanSeenText - - ; text when trainer beaten - dw PokefanmAllanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript PokefanmAllanScript: talkaftercancel diff --git a/maps/Route8.asm b/maps/Route8.asm index 377aa8f58..3cfc2992b 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -6,23 +6,7 @@ Route8_MapScriptHeader: db 0 TrainerBikerDwayne: - ; bit/flag number - dw EVENT_BEAT_BIKER_DWAYNE - - ; trainer group && trainer id - db BIKER, DWAYNE - - ; text when seen - dw BikerDwayneSeenText - - ; text when trainer beaten - dw BikerDwayneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, $0000, BikerDwayneScript BikerDwayneScript: talkaftercancel @@ -33,23 +17,7 @@ BikerDwayneScript: end TrainerBikerHarris: - ; bit/flag number - dw EVENT_BEAT_BIKER_HARRIS - - ; trainer group && trainer id - db BIKER, HARRIS - - ; text when seen - dw BikerHarrisSeenText - - ; text when trainer beaten - dw BikerHarrisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, $0000, BikerHarrisScript BikerHarrisScript: talkaftercancel @@ -60,23 +28,7 @@ BikerHarrisScript: end TrainerBikerZeke: - ; bit/flag number - dw EVENT_BEAT_BIKER_ZEKE - - ; trainer group && trainer id - db BIKER, ZEKE - - ; text when seen - dw BikerZekeSeenText - - ; text when trainer beaten - dw BikerZekeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, $0000, BikerZekeScript BikerZekeScript: talkaftercancel @@ -87,23 +39,7 @@ BikerZekeScript: end TrainerSupernerdSam: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_SAM - - ; trainer group && trainer id - db SUPER_NERD, SAM - - ; text when seen - dw SupernerdSamSeenText - - ; text when trainer beaten - dw SupernerdSamBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, $0000, SupernerdSamScript SupernerdSamScript: talkaftercancel @@ -114,23 +50,7 @@ SupernerdSamScript: end TrainerSupernerdTom: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_TOM - - ; trainer group && trainer id - db SUPER_NERD, TOM - - ; text when seen - dw SupernerdTomSeenText - - ; text when trainer beaten - dw SupernerdTomBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, $0000, SupernerdTomScript SupernerdTomScript: talkaftercancel diff --git a/maps/Route9.asm b/maps/Route9.asm index 032f33cc7..70c052907 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -6,23 +6,7 @@ Route9_MapScriptHeader: db 0 TrainerCamperDean: - ; bit/flag number - dw EVENT_BEAT_CAMPER_DEAN - - ; trainer group && trainer id - db CAMPER, DEAN - - ; text when seen - dw CamperDeanSeenText - - ; text when trainer beaten - dw CamperDeanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, $0000, CamperDeanScript CamperDeanScript: talkaftercancel @@ -33,23 +17,7 @@ CamperDeanScript: end TrainerPicnickerHeidi: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_HEIDI - - ; trainer group && trainer id - db PICNICKER, HEIDI - - ; text when seen - dw PicnickerHeidiSeenText - - ; text when trainer beaten - dw PicnickerHeidiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, $0000, PicnickerHeidiScript PicnickerHeidiScript: talkaftercancel @@ -60,23 +28,7 @@ PicnickerHeidiScript: end TrainerCamperSid: - ; bit/flag number - dw EVENT_BEAT_CAMPER_SID - - ; trainer group && trainer id - db CAMPER, SID - - ; text when seen - dw CamperSidSeenText - - ; text when trainer beaten - dw CamperSidBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, $0000, CamperSidScript CamperSidScript: talkaftercancel @@ -87,23 +39,7 @@ CamperSidScript: end TrainerPicnickerEdna: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_EDNA - - ; trainer group && trainer id - db PICNICKER, EDNA - - ; text when seen - dw PicnickerEdnaSeenText - - ; text when trainer beaten - dw PicnickerEdnaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, $0000, PicnickerEdnaScript PicnickerEdnaScript: talkaftercancel @@ -114,23 +50,7 @@ PicnickerEdnaScript: end TrainerHikerTim: - ; bit/flag number - dw EVENT_BEAT_HIKER_TIM - - ; trainer group && trainer id - db HIKER, TIM - - ; text when seen - dw HikerTimSeenText - - ; text when trainer beaten - dw HikerTimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, $0000, HikerTimScript HikerTimScript: talkaftercancel @@ -141,23 +61,7 @@ HikerTimScript: end TrainerHikerSidney: - ; bit/flag number - dw EVENT_BEAT_HIKER_SIDNEY - - ; trainer group && trainer id - db HIKER, SIDNEY - - ; text when seen - dw HikerSidneySeenText - - ; text when trainer beaten - dw HikerSidneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, $0000, HikerSidneyScript HikerSidneyScript: talkaftercancel diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index b6be9055d..56340f81b 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -14,7 +14,7 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: dbw 1, UnknownScript_0x58bf8 UnknownScript_0x58be9: - special Function8adef + special SpecialOmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58bf3 end diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 7c8bfc4f0..9eef950ad 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -100,23 +100,7 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_NATHAN - - ; trainer group && trainer id - db PSYCHIC_T, NATHAN - - ; text when seen - dw PsychicNathanSeenText - - ; text when trainer beaten - dw PsychicNathanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, $0000, PsychicNathanScript PsychicNathanScript: talkaftercancel @@ -128,23 +112,7 @@ PsychicNathanScript: TrainerSuperNerdStan: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_STAN - - ; trainer group && trainer id - db SUPER_NERD, STAN - - ; text when seen - dw UnknownText_0x581e5 - - ; text when trainer beaten - dw UnknownText_0x58217 - - ; script when lost - dw $0000 - - ; script when talk again - dw UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, $0000, UnknownScript_0x580a9 UnknownScript_0x580a9: talkaftercancel diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index bb7aa1569..9659388a2 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -39,23 +39,7 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_REBECCA - - ; trainer group && trainer id - db MEDIUM, REBECCA - - ; text when seen - dw MediumRebeccaSeenText - - ; text when trainer beaten - dw MediumRebeccaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, $0000, MediumRebeccaScript MediumRebeccaScript: talkaftercancel @@ -66,23 +50,7 @@ MediumRebeccaScript: end TrainerPsychicFranklin: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_FRANKLIN - - ; trainer group && trainer id - db PSYCHIC_T, FRANKLIN - - ; text when seen - dw PsychicFranklinSeenText - - ; text when trainer beaten - dw PsychicFranklinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, $0000, PsychicFranklinScript PsychicFranklinScript: talkaftercancel @@ -93,23 +61,7 @@ PsychicFranklinScript: end TrainerMediumDoris: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_DORIS - - ; trainer group && trainer id - db MEDIUM, DORIS - - ; text when seen - dw MediumDorisSeenText - - ; text when trainer beaten - dw MediumDorisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, $0000, MediumDorisScript MediumDorisScript: talkaftercancel @@ -120,23 +72,7 @@ MediumDorisScript: end TrainerPsychicJared: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_JARED - - ; trainer group && trainer id - db PSYCHIC_T, JARED - - ; text when seen - dw PsychicJaredSeenText - - ; text when trainer beaten - dw PsychicJaredBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, $0000, PsychicJaredScript PsychicJaredScript: talkaftercancel diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index f7889562f..a8344728a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -9,23 +9,7 @@ KurtScript_0x5a5d5: jumptextfaceplayer UnknownText_0x5a6b5 TrainerGruntM29: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_29 - - ; trainer group && trainer id - db GRUNTM, 29 - - ; text when seen - dw GruntM29SeenText - - ; text when trainer beaten - dw GruntM29BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, $0000, GruntM29Script GruntM29Script: talkaftercancel @@ -36,23 +20,7 @@ GruntM29Script: end TrainerGruntM1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_1 - - ; trainer group && trainer id - db GRUNTM, 1 - - ; text when seen - dw GruntM1SeenText - - ; text when trainer beaten - dw GruntM1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, $0000, GruntM1Script GruntM1Script: loadfont @@ -95,23 +63,7 @@ GruntM1Script: end TrainerGruntM2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_2 - - ; trainer group && trainer id - db GRUNTM, 2 - - ; text when seen - dw GruntM2SeenText - - ; text when trainer beaten - dw GruntM2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, $0000, GruntM2Script GruntM2Script: talkaftercancel @@ -122,23 +74,7 @@ GruntM2Script: end TrainerGruntF1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_1 - - ; trainer group && trainer id - db GRUNTF, 1 - - ; text when seen - dw GruntF1SeenText - - ; text when trainer beaten - dw GruntF1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, $0000, GruntF1Script GruntF1Script: talkaftercancel diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 30c0a5ec2..5bcca752d 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -18,23 +18,7 @@ TeacherScript_0x184507: jumptextfaceplayer UnknownText_0x18469d TrainerSageChow: - ; bit/flag number - dw EVENT_BEAT_SAGE_CHOW - - ; trainer group && trainer id - db SAGE, CHOW - - ; text when seen - dw SageChowSeenText - - ; text when trainer beaten - dw SageChowBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, $0000, SageChowScript SageChowScript: talkaftercancel diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 1d74f3b1a..5a74dee7e 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -6,23 +6,7 @@ SproutTower2F_MapScriptHeader: db 0 TrainerSageNico: - ; bit/flag number - dw EVENT_BEAT_SAGE_NICO - - ; trainer group && trainer id - db SAGE, NICO - - ; text when seen - dw SageNicoSeenText - - ; text when trainer beaten - dw SageNicoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, $0000, SageNicoScript SageNicoScript: talkaftercancel @@ -33,23 +17,7 @@ SageNicoScript: end TrainerSageEdmond: - ; bit/flag number - dw EVENT_BEAT_SAGE_EDMOND - - ; trainer group && trainer id - db SAGE, EDMOND - - ; text when seen - dw SageEdmondSeenText - - ; text when trainer beaten - dw SageEdmondBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, $0000, SageEdmondScript SageEdmondScript: talkaftercancel diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index dbbde2c39..da477d731 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -86,23 +86,7 @@ UnknownScript_0x1849d1: end TrainerSageJin: - ; bit/flag number - dw EVENT_BEAT_SAGE_JIN - - ; trainer group && trainer id - db SAGE, JIN - - ; text when seen - dw SageJinSeenText - - ; text when trainer beaten - dw SageJinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, $0000, SageJinScript SageJinScript: talkaftercancel @@ -113,23 +97,7 @@ SageJinScript: end TrainerSageTroy: - ; bit/flag number - dw EVENT_BEAT_SAGE_TROY - - ; trainer group && trainer id - db SAGE, TROY - - ; text when seen - dw SageTroySeenText - - ; text when trainer beaten - dw SageTroyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, $0000, SageTroyScript SageTroyScript: talkaftercancel @@ -140,23 +108,7 @@ SageTroyScript: end TrainerSageNeal: - ; bit/flag number - dw EVENT_BEAT_SAGE_NEAL - - ; trainer group && trainer id - db SAGE, NEAL - - ; text when seen - dw SageNealSeenText - - ; text when trainer beaten - dw SageNealBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, $0000, SageNealScript SageNealScript: talkaftercancel diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 1ee9fa25f..6e93dcb2d 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -478,23 +478,7 @@ NoExplodingTrap: end TrainerScientistJed: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_JED - - ; trainer group && trainer id - db SCIENTIST, JED - - ; text when seen - dw ScientistJedSeenText - - ; text when trainer beaten - dw ScientistJedBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, $0000, ScientistJedScript ScientistJedScript: talkaftercancel @@ -505,23 +489,7 @@ ScientistJedScript: end TrainerGruntM16: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_16 - - ; trainer group && trainer id - db GRUNTM, 16 - - ; text when seen - dw GruntM16SeenText - - ; text when trainer beaten - dw GruntM16BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, $0000, GruntM16Script GruntM16Script: talkaftercancel diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 8da4ee230..738d3da5a 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -178,23 +178,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_17 - - ; trainer group && trainer id - db GRUNTM, 17 - - ; text when seen - dw GruntM17SeenText - - ; text when trainer beaten - dw GruntM17BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, $0000, GruntM17Script GruntM17Script: talkaftercancel @@ -205,23 +189,7 @@ GruntM17Script: end TrainerGruntM18: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_18 - - ; trainer group && trainer id - db GRUNTM, 18 - - ; text when seen - dw GruntM18SeenText - - ; text when trainer beaten - dw GruntM18BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, $0000, GruntM18Script GruntM18Script: talkaftercancel @@ -232,23 +200,7 @@ GruntM18Script: end TrainerGruntM19: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_19 - - ; trainer group && trainer id - db GRUNTM, 19 - - ; text when seen - dw GruntM19SeenText - - ; text when trainer beaten - dw GruntM19BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, $0000, GruntM19Script GruntM19Script: talkaftercancel diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index b0acfa21c..80d20a251 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -117,23 +117,7 @@ MoltresScript_0x6e091: end TrainerGruntF5: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_5 - - ; trainer group && trainer id - db GRUNTF, 5 - - ; text when seen - dw GruntF5SeenText - - ; text when trainer beaten - dw GruntF5BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF5Script + trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, $0000, GruntF5Script GruntF5Script: talkaftercancel @@ -145,23 +129,7 @@ GruntF5Script: end TrainerGruntM28: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_28 - - ; trainer group && trainer id - db GRUNTM, 28 - - ; text when seen - dw GruntM28SeenText - - ; text when trainer beaten - dw GruntM28BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM28Script + trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, $0000, GruntM28Script GruntM28Script: talkaftercancel @@ -173,23 +141,7 @@ GruntM28Script: end TrainerScientistRoss: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_ROSS - - ; trainer group && trainer id - db SCIENTIST, ROSS - - ; text when seen - dw ScientistRossSeenText - - ; text when trainer beaten - dw ScientistRossBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, $0000, ScientistRossScript ScientistRossScript: talkaftercancel @@ -200,23 +152,7 @@ ScientistRossScript: end TrainerScientistMitch: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_MITCH - - ; trainer group && trainer id - db SCIENTIST, MITCH - - ; text when seen - dw ScientistMitchSeenText - - ; text when trainer beaten - dw ScientistMitchBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, $0000, ScientistMitchScript ScientistMitchScript: talkaftercancel diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index fc8b7befa..4e0ed23b9 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -166,23 +166,7 @@ UnknownScript_0x7cb29: end TrainerGruntM11: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_11 - - ; trainer group && trainer id - db GRUNTM, 11 - - ; text when seen - dw GruntM11SeenText - - ; text when trainer beaten - dw GruntM11BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, $0000, GruntM11Script GruntM11Script: talkaftercancel @@ -193,23 +177,7 @@ GruntM11Script: end TrainerGruntM25: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_25 - - ; trainer group && trainer id - db GRUNTM, 25 - - ; text when seen - dw GruntM25SeenText - - ; text when trainer beaten - dw GruntM25BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, $0000, GruntM25Script GruntM25Script: talkaftercancel @@ -220,23 +188,7 @@ GruntM25Script: end TrainerBurglarDuncan: - ; bit/flag number - dw EVENT_BEAT_BURGLAR_DUNCAN - - ; trainer group && trainer id - db BURGLAR, DUNCAN - - ; text when seen - dw BurglarDuncanSeenText - - ; text when trainer beaten - dw BurglarDuncanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, $0000, BurglarDuncanScript BurglarDuncanScript: talkaftercancel @@ -247,23 +199,7 @@ BurglarDuncanScript: end TrainerBurglarEddie: - ; bit/flag number - dw EVENT_BEAT_BURGLAR_EDDIE - - ; trainer group && trainer id - db BURGLAR, EDDIE - - ; text when seen - dw BurglarEddieSeenText - - ; text when trainer beaten - dw BurglarEddieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, $0000, BurglarEddieScript BurglarEddieScript: talkaftercancel @@ -274,23 +210,7 @@ BurglarEddieScript: end TrainerGruntM13: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_13 - - ; trainer group && trainer id - db GRUNTM, 13 - - ; text when seen - dw GruntM13SeenText - - ; text when trainer beaten - dw GruntM13BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, $0000, GruntM13Script GruntM13Script: talkaftercancel @@ -301,23 +221,7 @@ GruntM13Script: end TrainerGruntF3: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_3 - - ; trainer group && trainer id - db GRUNTF, 3 - - ; text when seen - dw GruntF3SeenText - - ; text when trainer beaten - dw GruntF3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, $0000, GruntF3Script GruntF3Script: talkaftercancel diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 5a6b56941..776697e74 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -30,23 +30,7 @@ UnknownScript_0x7d950: return TrainerGruntM24: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_24 - - ; trainer group && trainer id - db GRUNTM, 24 - - ; text when seen - dw GruntM24SeenText - - ; text when trainer beaten - dw GruntM24BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, $0000, GruntM24Script GruntM24Script: talkaftercancel @@ -57,23 +41,7 @@ GruntM24Script: end TrainerGruntM14: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_14 - - ; trainer group && trainer id - db GRUNTM, 14 - - ; text when seen - dw GruntM14SeenText - - ; text when trainer beaten - dw GruntM14BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, $0000, GruntM14Script GruntM14Script: talkaftercancel @@ -84,23 +52,7 @@ GruntM14Script: end TrainerGruntM15: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_15 - - ; trainer group && trainer id - db GRUNTM, 15 - - ; text when seen - dw GruntM15SeenText - - ; text when trainer beaten - dw GruntM15BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, $0000, GruntM15Script GruntM15Script: talkaftercancel diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 68445bb22..02ff035b6 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -6,23 +6,7 @@ UnionCave1F_MapScriptHeader: db 0 TrainerPokemaniacLarry: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_LARRY - - ; trainer group && trainer id - db POKEMANIAC, LARRY - - ; text when seen - dw PokemaniacLarrySeenText - - ; text when trainer beaten - dw PokemaniacLarryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, $0000, PokemaniacLarryScript PokemaniacLarryScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacLarryScript: end TrainerHikerRussell: - ; bit/flag number - dw EVENT_BEAT_HIKER_RUSSELL - - ; trainer group && trainer id - db HIKER, RUSSELL - - ; text when seen - dw HikerRussellSeenText - - ; text when trainer beaten - dw HikerRussellBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, $0000, HikerRussellScript HikerRussellScript: talkaftercancel @@ -60,23 +28,7 @@ HikerRussellScript: end TrainerHikerDaniel: - ; bit/flag number - dw EVENT_BEAT_HIKER_DANIEL - - ; trainer group && trainer id - db HIKER, DANIEL - - ; text when seen - dw HikerDanielSeenText - - ; text when trainer beaten - dw HikerDanielBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, $0000, HikerDanielScript HikerDanielScript: talkaftercancel @@ -87,23 +39,7 @@ HikerDanielScript: end TrainerFirebreatherBill: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_BILL - - ; trainer group && trainer id - db FIREBREATHER, BILL - - ; text when seen - dw FirebreatherBillSeenText - - ; text when trainer beaten - dw FirebreatherBillBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, $0000, FirebreatherBillScript FirebreatherBillScript: talkaftercancel @@ -114,23 +50,7 @@ FirebreatherBillScript: end TrainerFirebreatherRay: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_RAY - - ; trainer group && trainer id - db FIREBREATHER, RAY - - ; text when seen - dw FirebreatherRaySeenText - - ; text when trainer beaten - dw FirebreatherRayBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, $0000, FirebreatherRayScript FirebreatherRayScript: talkaftercancel diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 8ff1dce72..66236621b 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -6,23 +6,7 @@ UnionCaveB1F_MapScriptHeader: db 0 TrainerPokemaniacAndrew: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ANDREW - - ; trainer group && trainer id - db POKEMANIAC, ANDREW - - ; text when seen - dw PokemaniacAndrewSeenText - - ; text when trainer beaten - dw PokemaniacAndrewBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, $0000, PokemaniacAndrewScript PokemaniacAndrewScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacAndrewScript: end TrainerPokemaniacCalvin: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_CALVIN - - ; trainer group && trainer id - db POKEMANIAC, CALVIN - - ; text when seen - dw PokemaniacCalvinSeenText - - ; text when trainer beaten - dw PokemaniacCalvinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, $0000, PokemaniacCalvinScript PokemaniacCalvinScript: talkaftercancel @@ -60,23 +28,7 @@ PokemaniacCalvinScript: end TrainerHikerPhillip: - ; bit/flag number - dw EVENT_BEAT_HIKER_PHILLIP - - ; trainer group && trainer id - db HIKER, PHILLIP - - ; text when seen - dw HikerPhillipSeenText - - ; text when trainer beaten - dw HikerPhillipBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, $0000, HikerPhillipScript HikerPhillipScript: talkaftercancel @@ -87,23 +39,7 @@ HikerPhillipScript: end TrainerHikerLeonard: - ; bit/flag number - dw EVENT_BEAT_HIKER_LEONARD - - ; trainer group && trainer id - db HIKER, LEONARD - - ; text when seen - dw HikerLeonardSeenText - - ; text when trainer beaten - dw HikerLeonardBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, $0000, HikerLeonardScript HikerLeonardScript: talkaftercancel diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 863629925..20d6e3f00 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -33,23 +33,7 @@ SurfScript_0x5a31f: end TrainerCooltrainermNick: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_NICK - - ; trainer group && trainer id - db COOLTRAINERM, NICK - - ; text when seen - dw CooltrainermNickSeenText - - ; text when trainer beaten - dw CooltrainermNickBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, $0000, CooltrainermNickScript CooltrainermNickScript: talkaftercancel @@ -60,23 +44,7 @@ CooltrainermNickScript: end TrainerCooltrainerfGwen: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_GWEN - - ; trainer group && trainer id - db COOLTRAINERF, GWEN - - ; text when seen - dw CooltrainerfGwenSeenText - - ; text when trainer beaten - dw CooltrainerfGwenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, $0000, CooltrainerfGwenScript CooltrainerfGwenScript: talkaftercancel @@ -87,23 +55,7 @@ CooltrainerfGwenScript: end TrainerCooltrainerfEmma: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_EMMA - - ; trainer group && trainer id - db COOLTRAINERF, EMMA - - ; text when seen - dw CooltrainerfEmmaSeenText - - ; text when trainer beaten - dw CooltrainerfEmmaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, $0000, CooltrainerfEmmaScript CooltrainerfEmmaScript: talkaftercancel diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index a29e196c8..b10e97aab 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -38,23 +38,7 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_GREGORY - - ; trainer group && trainer id - db GENTLEMAN, GREGORY - - ; text when seen - dw GentlemanGregorySeenText - - ; text when trainer beaten - dw GentlemanGregoryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, $0000, GentlemanGregoryScript GentlemanGregoryScript: talkaftercancel @@ -65,23 +49,7 @@ GentlemanGregoryScript: end TrainerGuitaristVincent: - ; bit/flag number - dw EVENT_BEAT_GUITARIST_VINCENT - - ; trainer group && trainer id - db GUITARIST, VINCENT - - ; text when seen - dw GuitaristVincentSeenText - - ; text when trainer beaten - dw GuitaristVincentBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, $0000, GuitaristVincentScript GuitaristVincentScript: talkaftercancel @@ -92,23 +60,7 @@ GuitaristVincentScript: end TrainerJugglerHorton: - ; bit/flag number - dw EVENT_BEAT_JUGGLER_HORTON - - ; trainer group && trainer id - db JUGGLER, HORTON - - ; text when seen - dw JugglerHortonSeenText - - ; text when trainer beaten - dw JugglerHortonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, $0000, JugglerHortonScript JugglerHortonScript: talkaftercancel diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 932c3b5c8..d1b39d8aa 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -61,23 +61,7 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ROD - - ; trainer group && trainer id - db BIRD_KEEPER, ROD - - ; text when seen - dw Bird_keeperRodSeenText - - ; text when trainer beaten - dw Bird_keeperRodBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, $0000, Bird_keeperRodScript Bird_keeperRodScript: talkaftercancel @@ -88,23 +72,7 @@ Bird_keeperRodScript: end TrainerBird_keeperAbe: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ABE - - ; trainer group && trainer id - db BIRD_KEEPER, ABE - - ; text when seen - dw Bird_keeperAbeSeenText - - ; text when trainer beaten - dw Bird_keeperAbeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, $0000, Bird_keeperAbeScript Bird_keeperAbeScript: talkaftercancel diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 3fcc7eb36..1d1bfe715 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -105,23 +105,7 @@ WarehouseEntrance_MapScriptHeader: return TrainerSupernerdEric: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_ERIC - - ; trainer group && trainer id - db SUPER_NERD, ERIC - - ; text when seen - dw SupernerdEricSeenText - - ; text when trainer beaten - dw SupernerdEricBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, $0000, SupernerdEricScript SupernerdEricScript: talkaftercancel @@ -132,23 +116,7 @@ SupernerdEricScript: end TrainerSupernerdTeru: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_TERU - - ; trainer group && trainer id - db SUPER_NERD, TERU - - ; text when seen - dw SupernerdTeruSeenText - - ; text when trainer beaten - dw SupernerdTeruBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, $0000, SupernerdTeruScript SupernerdTeruScript: talkaftercancel @@ -159,23 +127,7 @@ SupernerdTeruScript: end TrainerPokemaniacIssac: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ISSAC - - ; trainer group && trainer id - db POKEMANIAC, ISSAC - - ; text when seen - dw PokemaniacIssacSeenText - - ; text when trainer beaten - dw PokemaniacIssacBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, $0000, PokemaniacIssacScript PokemaniacIssacScript: talkaftercancel @@ -186,23 +138,7 @@ PokemaniacIssacScript: end TrainerPokemaniacDonald: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_DONALD - - ; trainer group && trainer id - db POKEMANIAC, DONALD - - ; text when seen - dw PokemaniacDonaldSeenText - - ; text when trainer beaten - dw PokemaniacDonaldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, $0000, PokemaniacDonaldScript PokemaniacDonaldScript: talkaftercancel diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 84316f758..54201cfbe 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -66,23 +66,7 @@ UnknownScript_0x985a3: end TrainerSageGaku: - ; bit/flag number - dw EVENT_BEAT_SAGE_GAKU - - ; trainer group && trainer id - db SAGE, GAKU - - ; text when seen - dw SageGakuSeenText - - ; text when trainer beaten - dw SageGakuBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, $0000, SageGakuScript SageGakuScript: loadfont @@ -92,23 +76,7 @@ SageGakuScript: end TrainerSageMasa: - ; bit/flag number - dw EVENT_BEAT_SAGE_MASA - - ; trainer group && trainer id - db SAGE, MASA - - ; text when seen - dw SageMasaSeenText - - ; text when trainer beaten - dw SageMasaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, $0000, SageMasaScript SageMasaScript: loadfont @@ -118,23 +86,7 @@ SageMasaScript: end TrainerSageKoji: - ; bit/flag number - dw EVENT_BEAT_SAGE_KOJI - - ; trainer group && trainer id - db SAGE, KOJI - - ; text when seen - dw SageKojiSeenText - - ; text when trainer beaten - dw SageKojiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, $0000, SageKojiScript SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER |