diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:37:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:37:48 -0400 |
| commit | 9903f7a77a1836c269119dcf2766df5ab09df765 (patch) | |
| tree | 9dafc62f5691fc3b1cda55ca24e31cc2d49ca655 | |
| parent | 4d8f66774e791bd6d30023b41fed7f2e00b0edac (diff) | |
Assign trainer consts to script cmd args
73 files changed, 805 insertions, 804 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index eff15df91..67ddfac23 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -11,6 +11,7 @@ #include "constants/battle.h" #include "constants/spawn_points.h" #include "constants/field_effects.h" +#include "constants/trainers.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -1577,12 +1578,12 @@ EventScript_1A6551:: @ 81A6551 clearflag FLAG_0x4BA clearflag FLAG_0x4BB clearflag FLAG_0x4BC - cleartrainerflag 438 - cleartrainerflag 439 - cleartrainerflag 440 - cleartrainerflag 739 - cleartrainerflag 740 - cleartrainerflag 741 + cleartrainerflag TRAINER_CHAMPION_TERRY + cleartrainerflag TRAINER_CHAMPION_TERRY_2 + cleartrainerflag TRAINER_CHAMPION_TERRY_3 + cleartrainerflag TRAINER_CHAMPION_TERRY_4 + cleartrainerflag TRAINER_CHAMPION_TERRY_5 + cleartrainerflag TRAINER_CHAMPION_TERRY_6 setvar VAR_0x4068, 0 return @@ -2081,68 +2082,68 @@ EventScript_1A6B18:: @ 81A6B18 end EventScript_1A6B76:: @ 81A6B76 - settrainerflag 142 + settrainerflag TRAINER_CAMPER_LIAM return EventScript_1A6B7A:: @ 81A6B7A - settrainerflag 150 - settrainerflag 234 + settrainerflag TRAINER_PICNICKER_DIANA + settrainerflag TRAINER_SWIMMER_MALE_LUIS return EventScript_1A6B81:: @ 81A6B81 - settrainerflag 141 - settrainerflag 220 - settrainerflag 423 + settrainerflag TRAINER_SAILOR_DWAYNE + settrainerflag TRAINER_ENGINEER_BAILY + settrainerflag TRAINER_GENTLEMAN_TUCKER return EventScript_1A6B8B:: @ 81A6B8B - settrainerflag 132 - settrainerflag 133 - settrainerflag 160 - settrainerflag 265 - settrainerflag 266 - settrainerflag 267 - settrainerflag 402 + settrainerflag TRAINER_LASS_KAY + settrainerflag TRAINER_LASS_LISA + settrainerflag TRAINER_PICNICKER_TINA + settrainerflag TRAINER_BEAUTY_BRIDGET + settrainerflag TRAINER_BEAUTY_TAMIA + settrainerflag TRAINER_BEAUTY_LORI + settrainerflag TRAINER_COOLTRAINER_MARY return EventScript_1A6BA1:: @ 81A6BA1 - settrainerflag 294 - settrainerflag 295 - settrainerflag 288 - settrainerflag 289 - settrainerflag 292 - settrainerflag 293 + settrainerflag TRAINER_TAMER_PHIL + settrainerflag TRAINER_TAMER_EDGAR + settrainerflag TRAINER_JUGGLER_KIRK + settrainerflag TRAINER_JUGGLER_SHAWN + settrainerflag TRAINER_JUGGLER_KAYDEN + settrainerflag TRAINER_JUGGLER_NATE return EventScript_1A6BB4:: @ 81A6BB4 - settrainerflag 280 - settrainerflag 281 - settrainerflag 282 - settrainerflag 283 - settrainerflag 462 - settrainerflag 463 - settrainerflag 464 + settrainerflag TRAINER_PSYCHIC_JOHAN + settrainerflag TRAINER_PSYCHIC_TYRON + settrainerflag TRAINER_PSYCHIC_CAMERON + settrainerflag TRAINER_PSYCHIC_PRESTON + settrainerflag TRAINER_CHANNELER_AMANDA + settrainerflag TRAINER_CHANNELER_STACY + settrainerflag TRAINER_CHANNELER_TASHA return EventScript_1A6BCA:: @ 81A6BCA - settrainerflag 177 - settrainerflag 178 - settrainerflag 179 - settrainerflag 180 - settrainerflag 213 - settrainerflag 214 - settrainerflag 215 + settrainerflag TRAINER_SUPER_NERD_ERIK + settrainerflag TRAINER_SUPER_NERD_AVERY + settrainerflag TRAINER_SUPER_NERD_DEREK + settrainerflag TRAINER_SUPER_NERD_ZAC + settrainerflag TRAINER_BURGLAR_QUINN + settrainerflag TRAINER_BURGLAR_RAMON + settrainerflag TRAINER_BURGLAR_DUSTY return EventScript_1A6BE0:: @ 81A6BE0 - settrainerflag 296 - settrainerflag 297 - settrainerflag 322 - settrainerflag 323 - settrainerflag 324 - settrainerflag 392 - settrainerflag 400 - settrainerflag 401 + settrainerflag TRAINER_TAMER_JASON + settrainerflag TRAINER_TAMER_COLE + settrainerflag TRAINER_BLACK_BELT_ATSUSHI + settrainerflag TRAINER_BLACK_BELT_KIYO + settrainerflag TRAINER_BLACK_BELT_TAKASHI + settrainerflag TRAINER_COOLTRAINER_SAMUEL + settrainerflag TRAINER_COOLTRAINER_YUJI + settrainerflag TRAINER_COOLTRAINER_WARREN return EventScript_1A6BF9:: @ 81A6BF9 @@ -4618,7 +4619,7 @@ gUnknown_81A93C0:: @ 81A93C0 .braille "FOR YOU.$" Route3_EventScript_1A93C9:: @ 81A93C9 - trainerbattle 0, 89, 0, Text_183560, Text_1835A0 + trainerbattle 0, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A93F0 @@ -4626,12 +4627,12 @@ Route3_EventScript_1A93C9:: @ 81A93C9 end EventScript_1A93F0:: @ 81A93F0 - trainerbattle 5, 89, 0, Text_1C149D, Text_1835A0 + trainerbattle 5, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 msgbox Text_1835B4, 6 end Route3_EventScript_1A9407:: @ 81A9407 - trainerbattle 0, 90, 0, Text_183786, Text_1837BD + trainerbattle 0, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A942E @@ -4639,12 +4640,12 @@ Route3_EventScript_1A9407:: @ 81A9407 end EventScript_1A942E:: @ 81A942E - trainerbattle 5, 90, 0, Text_1C1588, Text_1837BD + trainerbattle 5, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD msgbox Text_1837CF, 6 end Route3_EventScript_1A9445:: @ 81A9445 - trainerbattle 0, 105, 0, Text_1834E6, Text_183509 + trainerbattle 0, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A946C @@ -4652,12 +4653,12 @@ Route3_EventScript_1A9445:: @ 81A9445 end EventScript_1A946C:: @ 81A946C - trainerbattle 5, 105, 0, Text_1C147A, Text_183509 + trainerbattle 5, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 msgbox Text_18351C, 6 end Route3_EventScript_1A9483:: @ 81A9483 - trainerbattle 0, 106, 0, Text_183682, Text_1836B3 + trainerbattle 0, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A94AA @@ -4665,12 +4666,12 @@ Route3_EventScript_1A9483:: @ 81A9483 end EventScript_1A94AA:: @ 81A94AA - trainerbattle 5, 106, 0, Text_1C1521, Text_1836B3 + trainerbattle 5, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 msgbox Text_1836D9, 6 end Route3_EventScript_1A94C1:: @ 81A94C1 - trainerbattle 0, 107, 0, Text_183807, Text_183837 + trainerbattle 0, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A94E8 @@ -4678,12 +4679,12 @@ Route3_EventScript_1A94C1:: @ 81A94C1 end EventScript_1A94E8:: @ 81A94E8 - trainerbattle 5, 107, 0, Text_1C15C5, Text_183837 + trainerbattle 5, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 msgbox Text_183849, 6 end Route3_EventScript_1A94FF:: @ 81A94FF - trainerbattle 0, 116, 0, Text_183616, Text_18363F + trainerbattle 0, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9526 @@ -4691,12 +4692,12 @@ Route3_EventScript_1A94FF:: @ 81A94FF end EventScript_1A9526:: @ 81A9526 - trainerbattle 5, 116, 0, Text_1C14F3, Text_18363F + trainerbattle 5, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F msgbox Text_18364C, 6 end Route3_EventScript_1A953D:: @ 81A953D - trainerbattle 0, 117, 0, Text_18371B, Text_183746 + trainerbattle 0, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9564 @@ -4704,12 +4705,12 @@ Route3_EventScript_1A953D:: @ 81A953D end EventScript_1A9564:: @ 81A9564 - trainerbattle 5, 117, 0, Text_1C155D, Text_183746 + trainerbattle 5, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 msgbox Text_18374F, 6 end Route3_EventScript_1A957B:: @ 81A957B - trainerbattle 0, 118, 0, Text_18387A, Text_183891 + trainerbattle 0, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A95A2 @@ -4717,12 +4718,12 @@ Route3_EventScript_1A957B:: @ 81A957B end EventScript_1A95A2:: @ 81A95A2 - trainerbattle 5, 118, 0, Text_1C15F9, Text_183891 + trainerbattle 5, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 msgbox Text_18389C, 6 end Route4_EventScript_1A95B9:: @ 81A95B9 - trainerbattle 0, 119, 0, Text_183906, Text_183938 + trainerbattle 0, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A95E0 @@ -4730,12 +4731,12 @@ Route4_EventScript_1A95B9:: @ 81A95B9 end EventScript_1A95E0:: @ 81A95E0 - trainerbattle 5, 119, 0, Text_1C160F, Text_183938 + trainerbattle 5, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 msgbox Text_183957, 6 end Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle 0, 92, 0, Text_188F76, Text_188F95 + trainerbattle 0, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A961E @@ -4743,12 +4744,12 @@ Route24_EventScript_1A95F7:: @ 81A95F7 end EventScript_1A961E:: @ 81A961E - trainerbattle 5, 92, 0, Text_1C3657, Text_188F95 + trainerbattle 5, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 msgbox Text_188FA7, 6 end Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle 0, 110, 0, Text_18901B, Text_18908C + trainerbattle 0, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A965C @@ -4756,12 +4757,12 @@ Route24_EventScript_1A9635:: @ 81A9635 end EventScript_1A965C:: @ 81A965C - trainerbattle 5, 110, 0, Text_1C36DA, Text_18908C + trainerbattle 5, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C msgbox Text_18909E, 6 end Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle 0, 122, 0, Text_188F2C, Text_188F46 + trainerbattle 0, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A969A @@ -4769,12 +4770,12 @@ Route24_EventScript_1A9673:: @ 81A9673 end EventScript_1A969A:: @ 81A969A - trainerbattle 5, 122, 0, Text_1C3624, Text_188F46 + trainerbattle 5, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 msgbox Text_188F53, 6 end Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle 0, 123, 0, Text_188FC9, Text_188FE7 + trainerbattle 0, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A96D8 @@ -4782,12 +4783,12 @@ Route24_EventScript_1A96B1:: @ 81A96B1 end EventScript_1A96D8:: @ 81A96D8 - trainerbattle 5, 123, 0, Text_1C3685, Text_188FE7 + trainerbattle 5, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 msgbox Text_188FF9, 6 end Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle 0, 143, 0, Text_188E74, Text_188E94 + trainerbattle 0, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9716 @@ -4795,12 +4796,12 @@ Route24_EventScript_1A96EF:: @ 81A96EF end EventScript_1A9716:: @ 81A9716 - trainerbattle 5, 143, 0, Text_1C35EE, Text_188E94 + trainerbattle 5, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 msgbox Text_188EA3, 6 end Route24_EventScript_1A972D:: @ 81A972D - trainerbattle 0, 144, 0, Text_188ED9, Text_188EFA + trainerbattle 0, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9754 @@ -4808,12 +4809,12 @@ Route24_EventScript_1A972D:: @ 81A972D end EventScript_1A9754:: @ 81A9754 - trainerbattle 5, 144, 0, Text_1C360E, Text_188EFA + trainerbattle 5, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA msgbox Text_188F0A, 6 end Route25_EventScript_1A976B:: @ 81A976B - trainerbattle 0, 93, 0, Text_1890C0, Text_1890E6 + trainerbattle 0, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9792 @@ -4821,12 +4822,12 @@ Route25_EventScript_1A976B:: @ 81A976B end EventScript_1A9792:: @ 81A9792 - trainerbattle 5, 93, 0, Text_1C33E7, Text_1890E6 + trainerbattle 5, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 msgbox Text_1890F5, 6 end Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle 0, 94, 0, Text_189165, Text_1891A6 + trainerbattle 0, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A97D0 @@ -4834,12 +4835,12 @@ Route25_EventScript_1A97A9:: @ 81A97A9 end EventScript_1A97D0:: @ 81A97D0 - trainerbattle 5, 94, 0, Text_1C3404, Text_1891A6 + trainerbattle 5, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 msgbox Text_1891B3, 6 end Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle 0, 95, 0, Text_1892A9, Text_1892D9 + trainerbattle 0, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A980E @@ -4847,12 +4848,12 @@ Route25_EventScript_1A97E7:: @ 81A97E7 end EventScript_1A980E:: @ 81A980E - trainerbattle 5, 95, 0, Text_1C34D4, Text_1892D9 + trainerbattle 5, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 msgbox Text_1892EF, 6 end Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle 0, 153, 0, Text_189247, Text_189261 + trainerbattle 0, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A984C @@ -4860,12 +4861,12 @@ Route25_EventScript_1A9825:: @ 81A9825 end EventScript_1A984C:: @ 81A984C - trainerbattle 5, 153, 0, Text_1C349C, Text_189261 + trainerbattle 5, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 msgbox Text_189281, 6 end Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle 0, 125, 0, Text_189333, Text_189364 + trainerbattle 0, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A988A @@ -4873,12 +4874,12 @@ Route25_EventScript_1A9863:: @ 81A9863 end EventScript_1A988A:: @ 81A988A - trainerbattle 5, 125, 0, Text_1C350A, Text_189364 + trainerbattle 5, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 msgbox Text_189378, 6 end Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle 0, 182, 0, Text_1893A7, Text_1893EA + trainerbattle 0, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A98C8 @@ -4886,12 +4887,12 @@ Route25_EventScript_1A98A1:: @ 81A98A1 end EventScript_1A98C8:: @ 81A98C8 - trainerbattle 5, 182, 0, Text_1C353B, Text_1893EA + trainerbattle 5, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA msgbox Text_1893FB, 6 end Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle 0, 183, 0, Text_189423, Text_189459 + trainerbattle 0, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9906 @@ -4899,12 +4900,12 @@ Route25_EventScript_1A98DF:: @ 81A98DF end EventScript_1A9906:: @ 81A9906 - trainerbattle 5, 183, 0, Text_1C357E, Text_189459 + trainerbattle 5, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 msgbox Text_18947E, 6 end Route25_EventScript_1A991D:: @ 81A991D - trainerbattle 0, 184, 0, Text_1894DE, Text_18950A + trainerbattle 0, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9944 @@ -4912,12 +4913,12 @@ Route25_EventScript_1A991D:: @ 81A991D end EventScript_1A9944:: @ 81A9944 - trainerbattle 5, 184, 0, Text_1C35BC, Text_18950A + trainerbattle 5, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A msgbox Text_18951C, 6 end Route25_EventScript_1A995B:: @ 81A995B - trainerbattle 0, 471, 0, Text_1891EB, Text_189212 + trainerbattle 0, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9982 @@ -4925,12 +4926,12 @@ Route25_EventScript_1A995B:: @ 81A995B end EventScript_1A9982:: @ 81A9982 - trainerbattle 5, 471, 0, Text_1C3445, Text_189212 + trainerbattle 5, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 msgbox Text_18921D, 6 end Route6_EventScript_1A9999:: @ 81A9999 - trainerbattle 0, 111, 0, Text_183E9F, Text_183EC0 + trainerbattle 0, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A99C0 @@ -4938,12 +4939,12 @@ Route6_EventScript_1A9999:: @ 81A9999 end EventScript_1A99C0:: @ 81A99C0 - trainerbattle 5, 111, 0, Text_1C16E2, Text_183EC0 + trainerbattle 5, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 msgbox Text_183ED4, 6 end Route6_EventScript_1A99D7:: @ 81A99D7 - trainerbattle 0, 112, 0, Text_183FF0, Text_18401A + trainerbattle 0, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A99FE @@ -4951,12 +4952,12 @@ Route6_EventScript_1A99D7:: @ 81A99D7 end EventScript_1A99FE:: @ 81A99FE - trainerbattle 5, 112, 0, Text_1C176B, Text_18401A + trainerbattle 5, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A msgbox Text_18402B, 6 end Route6_EventScript_1A9A15:: @ 81A9A15 - trainerbattle 0, 145, 0, Text_183E04, Text_183E2A + trainerbattle 0, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9A3C @@ -4964,12 +4965,12 @@ Route6_EventScript_1A9A15:: @ 81A9A15 end EventScript_1A9A3C:: @ 81A9A3C - trainerbattle 5, 145, 0, Text_1C163C, Text_183E2A + trainerbattle 5, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A msgbox Text_183E3C, 6 end Route6_EventScript_1A9A53:: @ 81A9A53 - trainerbattle 0, 146, 0, Text_183F07, Text_183F24 + trainerbattle 0, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9A7A @@ -4977,12 +4978,12 @@ Route6_EventScript_1A9A53:: @ 81A9A53 end EventScript_1A9A7A:: @ 81A9A7A - trainerbattle 5, 146, 0, Text_1C1723, Text_183F24 + trainerbattle 5, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 msgbox Text_183F51, 6 end Route6_EventScript_1A9A91:: @ 81A9A91 - trainerbattle 0, 151, 0, Text_183E4E, Text_183E79 + trainerbattle 0, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9AB8 @@ -4990,12 +4991,12 @@ Route6_EventScript_1A9A91:: @ 81A9A91 end EventScript_1A9AB8:: @ 81A9AB8 - trainerbattle 5, 151, 0, Text_1C166D, Text_183E79 + trainerbattle 5, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 msgbox Text_183E8D, 6 end Route6_EventScript_1A9ACF:: @ 81A9ACF - trainerbattle 0, 152, 0, Text_183F90, Text_183FAB + trainerbattle 0, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9AF6 @@ -5003,12 +5004,12 @@ Route6_EventScript_1A9ACF:: @ 81A9ACF end EventScript_1A9AF6:: @ 81A9AF6 - trainerbattle 5, 152, 0, Text_1C1746, Text_183FAB + trainerbattle 5, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB msgbox Text_183FC4, 6 end Route11_EventScript_1A9B0D:: @ 81A9B0D - trainerbattle 0, 97, 0, Text_184FBD, Text_184FD8 + trainerbattle 0, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9B34 @@ -5016,12 +5017,12 @@ Route11_EventScript_1A9B0D:: @ 81A9B0D end EventScript_1A9B34:: @ 81A9B34 - trainerbattle 5, 97, 0, Text_1C1DB5, Text_184FD8 + trainerbattle 5, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 msgbox Text_184FEF, 6 end Route11_EventScript_1A9B4B:: @ 81A9B4B - trainerbattle 0, 98, 0, Text_18506A, Text_18509B + trainerbattle 0, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9B72 @@ -5029,12 +5030,12 @@ Route11_EventScript_1A9B4B:: @ 81A9B4B end EventScript_1A9B72:: @ 81A9B72 - trainerbattle 5, 98, 0, Text_1C1E1F, Text_18509B + trainerbattle 5, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B msgbox Text_1850CF, 6 end Route11_EventScript_1A9B89:: @ 81A9B89 - trainerbattle 0, 99, 0, Text_18517B, Text_1851AC + trainerbattle 0, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9BB0 @@ -5042,12 +5043,12 @@ Route11_EventScript_1A9B89:: @ 81A9B89 end EventScript_1A9BB0:: @ 81A9BB0 - trainerbattle 5, 99, 0, Text_1C1EE2, Text_1851AC + trainerbattle 5, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC msgbox Text_1851D2, 6 end Route11_EventScript_1A9BC7:: @ 81A9BC7 - trainerbattle 0, 100, 0, Text_185285, Text_1852C1 + trainerbattle 0, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9BEE @@ -5055,12 +5056,12 @@ Route11_EventScript_1A9BC7:: @ 81A9BC7 end EventScript_1A9BEE:: @ 81A9BEE - trainerbattle 5, 100, 0, Text_1C1F40, Text_1852C1 + trainerbattle 5, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 msgbox Text_1852E3, 6 end Route11_EventScript_1A9C05:: @ 81A9C05 - trainerbattle 0, 221, 0, Text_185011, Text_185037 + trainerbattle 0, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9C2C @@ -5068,12 +5069,12 @@ Route11_EventScript_1A9C05:: @ 81A9C05 end EventScript_1A9C2C:: @ 81A9C2C - trainerbattle 5, 221, 0, Text_1C1DE1, Text_185037 + trainerbattle 5, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 msgbox Text_18504A, 6 end Route11_EventScript_1A9C43:: @ 81A9C43 - trainerbattle 0, 222, 0, Text_185236, Text_185250 + trainerbattle 0, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9C6A @@ -5081,12 +5082,12 @@ Route11_EventScript_1A9C43:: @ 81A9C43 end EventScript_1A9C6A:: @ 81A9C6A - trainerbattle 5, 222, 0, Text_1C1F1D, Text_185250 + trainerbattle 5, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 msgbox Text_185266, 6 end Route11_EventScript_1A9C81:: @ 81A9C81 - trainerbattle 0, 258, 0, Text_184F01, Text_184F15 + trainerbattle 0, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9CA8 @@ -5094,12 +5095,12 @@ Route11_EventScript_1A9C81:: @ 81A9C81 end EventScript_1A9CA8:: @ 81A9CA8 - trainerbattle 5, 258, 0, Text_1C1D50, Text_184F15 + trainerbattle 5, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 msgbox Text_184F2E, 6 end Route11_EventScript_1A9CBF:: @ 81A9CBF - trainerbattle 0, 259, 0, Text_184F5D, Text_184F7E + trainerbattle 0, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9CE6 @@ -5107,12 +5108,12 @@ Route11_EventScript_1A9CBF:: @ 81A9CBF end EventScript_1A9CE6:: @ 81A9CE6 - trainerbattle 5, 259, 0, Text_1C1D79, Text_184F7E + trainerbattle 5, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E msgbox Text_184F8E, 6 end Route11_EventScript_1A9CFD:: @ 81A9CFD - trainerbattle 0, 260, 0, Text_1850E9, Text_185105 + trainerbattle 0, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9D24 @@ -5120,12 +5121,12 @@ Route11_EventScript_1A9CFD:: @ 81A9CFD end EventScript_1A9D24:: @ 81A9D24 - trainerbattle 5, 260, 0, Text_1C1E57, Text_185105 + trainerbattle 5, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 msgbox Text_185114, 6 end Route11_EventScript_1A9D3B:: @ 81A9D3B - trainerbattle 0, 261, 0, Text_185135, Text_18514E + trainerbattle 0, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9D62 @@ -5133,12 +5134,12 @@ Route11_EventScript_1A9D3B:: @ 81A9D3B end EventScript_1A9D62:: @ 81A9D62 - trainerbattle 5, 261, 0, Text_1C1E9F, Text_18514E + trainerbattle 5, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E msgbox Text_185161, 6 end Route9_EventScript_1A9D79:: @ 81A9D79 - trainerbattle 0, 114, 0, Text_184A2F, Text_184A6A + trainerbattle 0, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9DA0 @@ -5146,12 +5147,12 @@ Route9_EventScript_1A9D79:: @ 81A9D79 end EventScript_1A9DA0:: @ 81A9DA0 - trainerbattle 5, 114, 0, Text_1C1B83, Text_184A6A + trainerbattle 5, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A msgbox Text_184A8C, 6 end Route9_EventScript_1A9DB7:: @ 81A9DB7 - trainerbattle 0, 115, 0, Text_184B18, Text_184B32 + trainerbattle 0, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9DDE @@ -5159,12 +5160,12 @@ Route9_EventScript_1A9DB7:: @ 81A9DB7 end EventScript_1A9DDE:: @ 81A9DDE - trainerbattle 5, 115, 0, Text_1C1BDC, Text_184B32 + trainerbattle 5, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 msgbox Text_184B3B, 6 end Route9_EventScript_1A9DF5:: @ 81A9DF5 - trainerbattle 0, 148, 0, Text_184844, Text_18487E + trainerbattle 0, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9E1C @@ -5172,12 +5173,12 @@ Route9_EventScript_1A9DF5:: @ 81A9DF5 end EventScript_1A9E1C:: @ 81A9E1C - trainerbattle 5, 148, 0, Text_1C1A5D, Text_18487E + trainerbattle 5, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E msgbox Text_184890, 6 end Route9_EventScript_1A9E33:: @ 81A9E33 - trainerbattle 0, 149, 0, Text_18489E, Text_1848CC + trainerbattle 0, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9E5A @@ -5185,12 +5186,12 @@ Route9_EventScript_1A9E33:: @ 81A9E33 end EventScript_1A9E5A:: @ 81A9E5A - trainerbattle 5, 149, 0, Text_1C1A9B, Text_1848CC + trainerbattle 5, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC msgbox Text_1848DE, 6 end Route9_EventScript_1A9E71:: @ 81A9E71 - trainerbattle 0, 154, 0, Text_1847B7, Text_1847DF + trainerbattle 0, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9E98 @@ -5198,12 +5199,12 @@ Route9_EventScript_1A9E71:: @ 81A9E71 end EventScript_1A9E98:: @ 81A9E98 - trainerbattle 5, 154, 0, Text_1C1A2E, Text_1847DF + trainerbattle 5, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF msgbox Text_1847F0, 6 end Route9_EventScript_1A9EAF:: @ 81A9EAF - trainerbattle 0, 155, 0, Text_1848FF, Text_18491C + trainerbattle 0, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9ED6 @@ -5211,12 +5212,12 @@ Route9_EventScript_1A9EAF:: @ 81A9EAF end EventScript_1A9ED6:: @ 81A9ED6 - trainerbattle 5, 155, 0, Text_1C1AFB, Text_18491C + trainerbattle 5, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C msgbox Text_184931, 6 end Route9_EventScript_1A9EED:: @ 81A9EED - trainerbattle 0, 185, 0, Text_184ABE, Text_184AD5 + trainerbattle 0, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9F14 @@ -5224,12 +5225,12 @@ Route9_EventScript_1A9EED:: @ 81A9EED end EventScript_1A9F14:: @ 81A9F14 - trainerbattle 5, 185, 0, Text_1C1BBE, Text_184AD5 + trainerbattle 5, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 msgbox Text_184AF1, 6 end Route9_EventScript_1A9F2B:: @ 81A9F2B - trainerbattle 0, 186, 0, Text_1849DF, Text_184A04 + trainerbattle 0, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9F52 @@ -5237,12 +5238,12 @@ Route9_EventScript_1A9F2B:: @ 81A9F2B end EventScript_1A9F52:: @ 81A9F52 - trainerbattle 5, 186, 0, Text_1C1B5E, Text_184A04 + trainerbattle 5, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 msgbox Text_184A11, 6 end Route9_EventScript_1A9F69:: @ 81A9F69 - trainerbattle 0, 465, 0, Text_18495E, Text_18497F + trainerbattle 0, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9F90 @@ -5250,12 +5251,12 @@ Route9_EventScript_1A9F69:: @ 81A9F69 end EventScript_1A9F90:: @ 81A9F90 - trainerbattle 5, 465, 0, Text_1C1B37, Text_18497F + trainerbattle 5, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F msgbox Text_1849B0, 6 end Route10_EventScript_1A9FA7:: @ 81A9FA7 - trainerbattle 0, 156, 0, Text_184CF1, Text_184D31 + trainerbattle 0, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1A9FCE @@ -5263,12 +5264,12 @@ Route10_EventScript_1A9FA7:: @ 81A9FA7 end EventScript_1A9FCE:: @ 81A9FCE - trainerbattle 5, 156, 0, Text_1C1C9A, Text_184D31 + trainerbattle 5, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 msgbox Text_184D4D, 6 end Route10_EventScript_1A9FE5:: @ 81A9FE5 - trainerbattle 0, 157, 0, Text_184E04, Text_184E3B + trainerbattle 0, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA00C @@ -5276,12 +5277,12 @@ Route10_EventScript_1A9FE5:: @ 81A9FE5 end EventScript_1AA00C:: @ 81AA00C - trainerbattle 5, 157, 0, Text_1C1D14, Text_184E3B + trainerbattle 5, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B msgbox Text_184E5E, 6 end Route10_EventScript_1AA023:: @ 81AA023 - trainerbattle 0, 162, 0, Text_184B8A, Text_184BE5 + trainerbattle 0, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA04A @@ -5289,12 +5290,12 @@ Route10_EventScript_1AA023:: @ 81AA023 end EventScript_1AA04A:: @ 81AA04A - trainerbattle 5, 162, 0, Text_1C1BFA, Text_184BE5 + trainerbattle 5, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 msgbox Text_184BFB, 6 end Route10_EventScript_1AA061:: @ 81AA061 - trainerbattle 0, 163, 0, Text_184C86, Text_184CA7 + trainerbattle 0, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA088 @@ -5302,12 +5303,12 @@ Route10_EventScript_1AA061:: @ 81AA061 end EventScript_1AA088:: @ 81AA088 - trainerbattle 5, 163, 0, Text_1C1C76, Text_184CA7 + trainerbattle 5, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 msgbox Text_184CBB, 6 end Route10_EventScript_1AA09F:: @ 81AA09F - trainerbattle 0, 187, 0, Text_184C1D, Text_184C2D + trainerbattle 0, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA0C6 @@ -5315,12 +5316,12 @@ Route10_EventScript_1AA09F:: @ 81AA09F end EventScript_1AA0C6:: @ 81AA0C6 - trainerbattle 5, 187, 0, Text_1C1C4F, Text_184C2D + trainerbattle 5, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D msgbox Text_184C60, 6 end Route10_EventScript_1AA0DD:: @ 81AA0DD - trainerbattle 0, 188, 0, Text_184DAA, Text_184DCE + trainerbattle 0, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA104 @@ -5328,12 +5329,12 @@ Route10_EventScript_1AA0DD:: @ 81AA0DD end EventScript_1AA104:: @ 81AA104 - trainerbattle 5, 188, 0, Text_1C1CD3, Text_184DCE + trainerbattle 5, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE msgbox Text_184DE4, 6 end Route8_EventScript_1AA11B:: @ 81AA11B - trainerbattle 0, 128, 0, Text_1841ED, Text_184210 + trainerbattle 0, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA142 @@ -5341,12 +5342,12 @@ Route8_EventScript_1AA11B:: @ 81AA11B end EventScript_1AA142:: @ 81AA142 - trainerbattle 5, 128, 0, Text_1C1834, Text_184210 + trainerbattle 5, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 msgbox Text_18421B, 6 end Route8_EventScript_1AA159:: @ 81AA159 - trainerbattle 0, 129, 0, Text_184321, Text_184346 + trainerbattle 0, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA180 @@ -5354,12 +5355,12 @@ Route8_EventScript_1AA159:: @ 81AA159 end EventScript_1AA180:: @ 81AA180 - trainerbattle 5, 129, 0, Text_1C18AA, Text_184346 + trainerbattle 5, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 msgbox Text_184350, 6 end Route8_EventScript_1AA197:: @ 81AA197 - trainerbattle 0, 130, 0, Text_18437A, Text_1843A6 + trainerbattle 0, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA1BE @@ -5367,12 +5368,12 @@ Route8_EventScript_1AA197:: @ 81AA197 end EventScript_1AA1BE:: @ 81AA1BE - trainerbattle 5, 130, 0, Text_1C18DC, Text_1843A6 + trainerbattle 5, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 msgbox Text_1843D2, 6 end Route8_EventScript_1AA1D5:: @ 81AA1D5 - trainerbattle 0, 131, 0, Text_1844AC, Text_1844D6 + trainerbattle 0, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA1FC @@ -5380,12 +5381,12 @@ Route8_EventScript_1AA1D5:: @ 81AA1D5 end EventScript_1AA1FC:: @ 81AA1FC - trainerbattle 5, 131, 0, Text_1C1955, Text_1844D6 + trainerbattle 5, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 msgbox Text_1844FD, 6 end Route8_EventScript_1AA213:: @ 81AA213 - trainerbattle 0, 171, 0, Text_1840C5, Text_184100 + trainerbattle 0, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA23A @@ -5393,12 +5394,12 @@ Route8_EventScript_1AA213:: @ 81AA213 end EventScript_1AA23A:: @ 81AA23A - trainerbattle 5, 171, 0, Text_1C1793, Text_184100 + trainerbattle 5, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 msgbox Text_18410E, 6 end Route8_EventScript_1AA251:: @ 81AA251 - trainerbattle 0, 172, 0, Text_18417C, Text_1841B6 + trainerbattle 0, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA278 @@ -5406,12 +5407,12 @@ Route8_EventScript_1AA251:: @ 81AA251 end EventScript_1AA278:: @ 81AA278 - trainerbattle 5, 172, 0, Text_1C17F1, Text_1841B6 + trainerbattle 5, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 msgbox Text_1841C8, 6 end Route8_EventScript_1AA28F:: @ 81AA28F - trainerbattle 0, 173, 0, Text_184257, Text_18427A + trainerbattle 0, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA2B6 @@ -5419,12 +5420,12 @@ Route8_EventScript_1AA28F:: @ 81AA28F end EventScript_1AA2B6:: @ 81AA2B6 - trainerbattle 5, 173, 0, Text_1C1873, Text_18427A + trainerbattle 5, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A msgbox Text_1842B3, 6 end Route8_EventScript_1AA2CD:: @ 81AA2CD - trainerbattle 0, 262, 0, Text_18412F, Text_18414D + trainerbattle 0, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA2F4 @@ -5432,12 +5433,12 @@ Route8_EventScript_1AA2CD:: @ 81AA2CD end EventScript_1AA2F4:: @ 81AA2F4 - trainerbattle 5, 262, 0, Text_1C17CD, Text_18414D + trainerbattle 5, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D msgbox Text_184162, 6 end Route8_EventScript_1AA30B:: @ 81AA30B - trainerbattle 0, 264, 0, Text_184432, Text_18444F + trainerbattle 0, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA332 @@ -5445,12 +5446,12 @@ Route8_EventScript_1AA30B:: @ 81AA30B end EventScript_1AA332:: @ 81AA332 - trainerbattle 5, 264, 0, Text_1C191F, Text_18444F + trainerbattle 5, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F msgbox Text_184466, 6 end Route8_EventScript_1AA349:: @ 81AA349 - trainerbattle 4, 484, 0, Text_1845A4, Text_1845D0, Text_184616 + trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA374 @@ -5458,12 +5459,12 @@ Route8_EventScript_1AA349:: @ 81AA349 end EventScript_1AA374:: @ 81AA374 - trainerbattle 7, 484, 0, Text_1C19E5, Text_1845D0, Text_184616 + trainerbattle 7, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 msgbox Text_1845F2, 6 end Route8_EventScript_1AA38F:: @ 81AA38F - trainerbattle 4, 484, 0, Text_18464A, Text_184675, Text_1846AF + trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA3BA @@ -5471,12 +5472,12 @@ Route8_EventScript_1AA38F:: @ 81AA38F end EventScript_1AA3BA:: @ 81AA3BA - trainerbattle 7, 484, 0, Text_1C1A0D, Text_184675, Text_1846AF + trainerbattle 7, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF msgbox Text_18468B, 6 end Route8_EventScript_1AA3D5:: @ 81AA3D5 - trainerbattle 0, 535, 0, Text_1846E2, Text_1846FC + trainerbattle 0, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA3FC @@ -5484,12 +5485,12 @@ Route8_EventScript_1AA3D5:: @ 81AA3D5 end EventScript_1AA3FC:: @ 81AA3FC - trainerbattle 5, 535, 0, Text_1C199C, Text_1846FC + trainerbattle 5, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC msgbox Text_184719, 6 end Route8_EventScript_1AA413:: @ 81AA413 - trainerbattle 0, 536, 0, Text_184742, Text_184767 + trainerbattle 0, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA43A @@ -5497,12 +5498,12 @@ Route8_EventScript_1AA413:: @ 81AA413 end EventScript_1AA43A:: @ 81AA43A - trainerbattle 5, 536, 0, Text_1C19BC, Text_184767 + trainerbattle 5, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 msgbox Text_18477A, 6 end Route12_EventScript_1AA451:: @ 81AA451 - trainerbattle 0, 225, 0, Text_185402, Text_18541B + trainerbattle 0, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA478 @@ -5510,12 +5511,12 @@ Route12_EventScript_1AA451:: @ 81AA451 end EventScript_1AA478:: @ 81AA478 - trainerbattle 5, 225, 0, Text_1C1F9D, Text_18541B + trainerbattle 5, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B msgbox Text_185432, 6 end Route12_EventScript_1AA48F:: @ 81AA48F - trainerbattle 0, 226, 0, Text_18544E, Text_185475 + trainerbattle 0, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA4B6 @@ -5523,12 +5524,12 @@ Route12_EventScript_1AA48F:: @ 81AA48F end EventScript_1AA4B6:: @ 81AA4B6 - trainerbattle 5, 226, 0, Text_1C1FD8, Text_185475 + trainerbattle 5, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 msgbox Text_185488, 6 end Route12_EventScript_1AA4CD:: @ 81AA4CD - trainerbattle 0, 227, 0, Text_1855E1, Text_185606 + trainerbattle 0, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA4F4 @@ -5536,12 +5537,12 @@ Route12_EventScript_1AA4CD:: @ 81AA4CD end EventScript_1AA4F4:: @ 81AA4F4 - trainerbattle 5, 227, 0, Text_1C209C, Text_185606 + trainerbattle 5, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 msgbox Text_185616, 6 end Route12_EventScript_1AA50B:: @ 81AA50B - trainerbattle 0, 228, 0, Text_185682, Text_1856D0 + trainerbattle 0, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA532 @@ -5549,12 +5550,12 @@ Route12_EventScript_1AA50B:: @ 81AA50B end EventScript_1AA532:: @ 81AA532 - trainerbattle 5, 228, 0, Text_1C20D4, Text_1856D0 + trainerbattle 5, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 msgbox Text_1856DF, 6 end Route12_EventScript_1AA549:: @ 81AA549 - trainerbattle 0, 233, 0, Text_18570E, Text_185744 + trainerbattle 0, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA570 @@ -5562,12 +5563,12 @@ Route12_EventScript_1AA549:: @ 81AA549 end EventScript_1AA570:: @ 81AA570 - trainerbattle 5, 233, 0, Text_1C2134, Text_185744 + trainerbattle 5, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 msgbox Text_18574D, 6 end Route12_EventScript_1AA587:: @ 81AA587 - trainerbattle 0, 285, 0, Text_185547, Text_18559B + trainerbattle 0, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA5AE @@ -5575,12 +5576,12 @@ Route12_EventScript_1AA587:: @ 81AA587 end EventScript_1AA5AE:: @ 81AA5AE - trainerbattle 5, 285, 0, Text_1C203B, Text_18559B + trainerbattle 5, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B msgbox Text_1855A6, 6 end Route12_EventScript_1AA5C5:: @ 81AA5C5 - trainerbattle 0, 477, 0, Text_1854B9, Text_1854ED + trainerbattle 0, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA5EC @@ -5588,12 +5589,12 @@ Route12_EventScript_1AA5C5:: @ 81AA5C5 end EventScript_1AA5EC:: @ 81AA5EC - trainerbattle 5, 477, 0, Text_1C2008, Text_1854ED + trainerbattle 5, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED msgbox Text_1854F2, 6 end Route12_EventScript_1AA603:: @ 81AA603 - trainerbattle 4, 486, 0, Text_1857C5, Text_1857F1, Text_185842 + trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA62E @@ -5601,12 +5602,12 @@ Route12_EventScript_1AA603:: @ 81AA603 end EventScript_1AA62E:: @ 81AA62E - trainerbattle 7, 486, 0, Text_1C216B, Text_1857F1, Text_185842 + trainerbattle 7, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 msgbox Text_18581F, 6 end Route12_EventScript_1AA649:: @ 81AA649 - trainerbattle 4, 486, 0, Text_1858A6, Text_1858D0, Text_185908 + trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA674 @@ -5614,12 +5615,12 @@ Route12_EventScript_1AA649:: @ 81AA649 end EventScript_1AA674:: @ 81AA674 - trainerbattle 7, 486, 0, Text_1C219B, Text_1858D0, Text_185908 + trainerbattle 7, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 msgbox Text_1858E2, 6 end Route13_EventScript_1AA68F:: @ 81AA68F - trainerbattle 0, 195, 0, Text_185D05, Text_185D1D + trainerbattle 0, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA6B6 @@ -5627,12 +5628,12 @@ Route13_EventScript_1AA68F:: @ 81AA68F end EventScript_1AA6B6:: @ 81AA6B6 - trainerbattle 5, 195, 0, Text_1C236B, Text_185D1D + trainerbattle 5, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D msgbox Text_185D33, 6 end Route13_EventScript_1AA6CD:: @ 81AA6CD - trainerbattle 0, 268, 0, Text_185BFC, Text_185C1F + trainerbattle 0, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA6F4 @@ -5640,12 +5641,12 @@ Route13_EventScript_1AA6CD:: @ 81AA6CD end EventScript_1AA6F4:: @ 81AA6F4 - trainerbattle 5, 268, 0, Text_1C2306, Text_185C1F + trainerbattle 5, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F msgbox Text_185C35, 6 end Route13_EventScript_1AA70B:: @ 81AA70B - trainerbattle 0, 269, 0, Text_185C69, Text_185C95 + trainerbattle 0, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA732 @@ -5653,12 +5654,12 @@ Route13_EventScript_1AA70B:: @ 81AA70B end EventScript_1AA732:: @ 81AA732 - trainerbattle 5, 269, 0, Text_1C2340, Text_185C95 + trainerbattle 5, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 msgbox Text_185CA8, 6 end Route13_EventScript_1AA749:: @ 81AA749 - trainerbattle 0, 300, 0, Text_185955, Text_18597E + trainerbattle 0, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA770 @@ -5666,12 +5667,12 @@ Route13_EventScript_1AA749:: @ 81AA749 end EventScript_1AA770:: @ 81AA770 - trainerbattle 5, 300, 0, Text_1C21EE, Text_18597E + trainerbattle 5, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E msgbox Text_1859A2, 6 end Route13_EventScript_1AA787:: @ 81AA787 - trainerbattle 0, 301, 0, Text_185B8F, Text_185BCA + trainerbattle 0, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA7AE @@ -5679,12 +5680,12 @@ Route13_EventScript_1AA787:: @ 81AA787 end EventScript_1AA7AE:: @ 81AA7AE - trainerbattle 5, 301, 0, Text_1C22CA, Text_185BCA + trainerbattle 5, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA msgbox Text_185BDB, 6 end Route13_EventScript_1AA7C5:: @ 81AA7C5 - trainerbattle 0, 302, 0, Text_185D3D, Text_185D7B + trainerbattle 0, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA7EC @@ -5692,12 +5693,12 @@ Route13_EventScript_1AA7C5:: @ 81AA7C5 end EventScript_1AA7EC:: @ 81AA7EC - trainerbattle 5, 302, 0, Text_1C2383, Text_185D7B + trainerbattle 5, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B msgbox Text_185D89, 6 end Route13_EventScript_1AA803:: @ 81AA803 - trainerbattle 0, 466, 0, Text_185B12, Text_185B48 + trainerbattle 0, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA82A @@ -5705,12 +5706,12 @@ Route13_EventScript_1AA803:: @ 81AA803 end EventScript_1AA82A:: @ 81AA82A - trainerbattle 5, 466, 0, Text_1C2299, Text_185B48 + trainerbattle 5, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 msgbox Text_185B67, 6 end Route13_EventScript_1AA841:: @ 81AA841 - trainerbattle 0, 467, 0, Text_1859CF, Text_1859EC + trainerbattle 0, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA868 @@ -5718,12 +5719,12 @@ Route13_EventScript_1AA841:: @ 81AA841 end EventScript_1AA868:: @ 81AA868 - trainerbattle 5, 467, 0, Text_1C220C, Text_1859EC + trainerbattle 5, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC msgbox Text_1859F9, 6 end Route13_EventScript_1AA87F:: @ 81AA87F - trainerbattle 0, 468, 0, Text_185A37, Text_185A56 + trainerbattle 0, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA8A6 @@ -5731,12 +5732,12 @@ Route13_EventScript_1AA87F:: @ 81AA87F end EventScript_1AA8A6:: @ 81AA8A6 - trainerbattle 5, 468, 0, Text_1C223C, Text_185A56 + trainerbattle 5, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 msgbox Text_185A62, 6 end Route13_EventScript_1AA8BD:: @ 81AA8BD - trainerbattle 0, 469, 0, Text_185A91, Text_185AC1 + trainerbattle 0, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA8E4 @@ -5744,12 +5745,12 @@ Route13_EventScript_1AA8BD:: @ 81AA8BD end EventScript_1AA8E4:: @ 81AA8E4 - trainerbattle 5, 469, 0, Text_1C225B, Text_185AC1 + trainerbattle 5, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 msgbox Text_185ADE, 6 end Route14_EventScript_1AA8FB:: @ 81AA8FB - trainerbattle 0, 196, 0, Text_186344, Text_186362 + trainerbattle 0, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA922 @@ -5757,12 +5758,12 @@ Route14_EventScript_1AA8FB:: @ 81AA8FB end EventScript_1AA922:: @ 81AA922 - trainerbattle 5, 196, 0, Text_1C25D6, Text_186362 + trainerbattle 5, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 msgbox Text_18636E, 6 end Route14_EventScript_1AA939:: @ 81AA939 - trainerbattle 0, 207, 0, Text_1861F7, Text_186223 + trainerbattle 0, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA960 @@ -5770,12 +5771,12 @@ Route14_EventScript_1AA939:: @ 81AA939 end EventScript_1AA960:: @ 81AA960 - trainerbattle 5, 207, 0, Text_1C2531, Text_186223 + trainerbattle 5, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 msgbox Text_186239, 6 end Route14_EventScript_1AA977:: @ 81AA977 - trainerbattle 0, 208, 0, Text_186263, Text_186291 + trainerbattle 0, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA99E @@ -5783,12 +5784,12 @@ Route14_EventScript_1AA977:: @ 81AA977 end EventScript_1AA99E:: @ 81AA99E - trainerbattle 5, 208, 0, Text_1C2572, Text_186291 + trainerbattle 5, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 msgbox Text_18629D, 6 end Route14_EventScript_1AA9B5:: @ 81AA9B5 - trainerbattle 0, 209, 0, Text_1862BD, Text_1862EF + trainerbattle 0, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AA9DC @@ -5796,12 +5797,12 @@ Route14_EventScript_1AA9B5:: @ 81AA9B5 end EventScript_1AA9DC:: @ 81AA9DC - trainerbattle 5, 209, 0, Text_1C259E, Text_1862EF + trainerbattle 5, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF msgbox Text_1862F8, 6 end Route14_EventScript_1AA9F3:: @ 81AA9F3 - trainerbattle 0, 303, 0, Text_1860D9, Text_18610A + trainerbattle 0, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAA1A @@ -5809,12 +5810,12 @@ Route14_EventScript_1AA9F3:: @ 81AA9F3 end EventScript_1AAA1A:: @ 81AAA1A - trainerbattle 5, 303, 0, Text_1C24CB, Text_18610A + trainerbattle 5, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A msgbox Text_18611D, 6 end Route14_EventScript_1AAA31:: @ 81AAA31 - trainerbattle 0, 304, 0, Text_18618E, Text_1861B3 + trainerbattle 0, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAA58 @@ -5822,12 +5823,12 @@ Route14_EventScript_1AAA31:: @ 81AAA31 end EventScript_1AAA58:: @ 81AAA58 - trainerbattle 5, 304, 0, Text_1C2505, Text_1861B3 + trainerbattle 5, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 msgbox Text_1861BE, 6 end Route14_EventScript_1AAA6F:: @ 81AAA6F - trainerbattle 0, 313, 0, Text_185E4D, Text_185E81 + trainerbattle 0, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAA96 @@ -5835,12 +5836,12 @@ Route14_EventScript_1AAA6F:: @ 81AAA6F end EventScript_1AAA96:: @ 81AAA96 - trainerbattle 5, 313, 0, Text_1C23C1, Text_185E81 + trainerbattle 5, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 msgbox Text_185E9C, 6 end Route14_EventScript_1AAAAD:: @ 81AAAAD - trainerbattle 0, 314, 0, Text_185EDF, Text_185F0B + trainerbattle 0, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAAD4 @@ -5848,12 +5849,12 @@ Route14_EventScript_1AAAAD:: @ 81AAAAD end EventScript_1AAAD4:: @ 81AAAD4 - trainerbattle 5, 314, 0, Text_1C23EF, Text_185F0B + trainerbattle 5, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B msgbox Text_185F1A, 6 end Route14_EventScript_1AAAEB:: @ 81AAAEB - trainerbattle 0, 315, 0, Text_185F46, Text_185FAE + trainerbattle 0, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAB12 @@ -5861,12 +5862,12 @@ Route14_EventScript_1AAAEB:: @ 81AAAEB end EventScript_1AAB12:: @ 81AAB12 - trainerbattle 5, 315, 0, Text_1C2425, Text_185FAE + trainerbattle 5, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE msgbox Text_185FBB, 6 end Route14_EventScript_1AAB29:: @ 81AAB29 - trainerbattle 0, 316, 0, Text_186021, Text_18607C + trainerbattle 0, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAB50 @@ -5874,12 +5875,12 @@ Route14_EventScript_1AAB29:: @ 81AAB29 end EventScript_1AAB50:: @ 81AAB50 - trainerbattle 5, 316, 0, Text_1C2461, Text_18607C + trainerbattle 5, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C msgbox Text_186091, 6 end Route14_EventScript_1AAB67:: @ 81AAB67 - trainerbattle 4, 487, 0, Text_1863B7, Text_1863EA, Text_18642E + trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAB92 @@ -5887,12 +5888,12 @@ Route14_EventScript_1AAB67:: @ 81AAB67 end EventScript_1AAB92:: @ 81AAB92 - trainerbattle 7, 487, 0, Text_1C25FB, Text_1863EA, Text_18642E + trainerbattle 7, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E msgbox Text_18640D, 6 end Route14_EventScript_1AABAD:: @ 81AABAD - trainerbattle 4, 487, 0, Text_18645B, Text_186487, Text_1864D3 + trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AABD8 @@ -5900,12 +5901,12 @@ Route14_EventScript_1AABAD:: @ 81AABAD end EventScript_1AABD8:: @ 81AABD8 - trainerbattle 7, 487, 0, Text_1C261B, Text_186487, Text_1864D3 + trainerbattle 7, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 msgbox Text_18649C, 6 end Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle 0, 197, 0, Text_1868B6, Text_1868E8 + trainerbattle 0, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAC1A @@ -5913,12 +5914,12 @@ Route15_EventScript_1AABF3:: @ 81AABF3 end EventScript_1AAC1A:: @ 81AAC1A - trainerbattle 5, 197, 0, Text_1C27E7, Text_1868E8 + trainerbattle 5, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 msgbox Text_1868F1, 6 end Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle 0, 198, 0, Text_186936, Text_186968 + trainerbattle 0, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAC58 @@ -5926,12 +5927,12 @@ Route15_EventScript_1AAC31:: @ 81AAC31 end EventScript_1AAC58:: @ 81AAC58 - trainerbattle 5, 198, 0, Text_1C2814, Text_186968 + trainerbattle 5, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 msgbox Text_18697C, 6 end Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle 0, 273, 0, Text_18678B, Text_1867C1 + trainerbattle 0, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAC96 @@ -5939,12 +5940,12 @@ Route15_EventScript_1AAC6F:: @ 81AAC6F end EventScript_1AAC96:: @ 81AAC96 - trainerbattle 5, 273, 0, Text_1C2753, Text_1867C1 + trainerbattle 5, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 msgbox Text_1867DA, 6 end Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle 0, 274, 0, Text_18680C, Text_186841 + trainerbattle 0, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AACD4 @@ -5952,12 +5953,12 @@ Route15_EventScript_1AACAD:: @ 81AACAD end EventScript_1AACD4:: @ 81AACD4 - trainerbattle 5, 274, 0, Text_1C279D, Text_186841 + trainerbattle 5, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 msgbox Text_18686F, 6 end Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle 0, 305, 0, Text_18664F, Text_18667A + trainerbattle 0, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAD12 @@ -5965,12 +5966,12 @@ Route15_EventScript_1AACEB:: @ 81AACEB end EventScript_1AAD12:: @ 81AAD12 - trainerbattle 5, 305, 0, Text_1C26D3, Text_18667A + trainerbattle 5, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A msgbox Text_18668D, 6 end Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle 0, 306, 0, Text_1866D1, Text_186707 + trainerbattle 0, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAD50 @@ -5978,12 +5979,12 @@ Route15_EventScript_1AAD29:: @ 81AAD29 end EventScript_1AAD50:: @ 81AAD50 - trainerbattle 5, 306, 0, Text_1C2717, Text_186707 + trainerbattle 5, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 msgbox Text_18671A, 6 end Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle 0, 478, 0, Text_186A22, Text_186A40 + trainerbattle 0, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAD8E @@ -5991,12 +5992,12 @@ Route15_EventScript_1AAD67:: @ 81AAD67 end EventScript_1AAD8E:: @ 81AAD8E - trainerbattle 5, 478, 0, Text_1C287D, Text_186A40 + trainerbattle 5, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 msgbox Text_186A55, 6 end Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle 0, 479, 0, Text_18650B, Text_186549 + trainerbattle 0, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AADCC @@ -6004,12 +6005,12 @@ Route15_EventScript_1AADA5:: @ 81AADA5 end EventScript_1AADCC:: @ 81AADCC - trainerbattle 5, 479, 0, Text_1C2650, Text_186549 + trainerbattle 5, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 msgbox Text_18655A, 6 end Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle 0, 480, 0, Text_1865D3, Text_186612 + trainerbattle 0, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAE0A @@ -6017,12 +6018,12 @@ Route15_EventScript_1AADE3:: @ 81AADE3 end EventScript_1AAE0A:: @ 81AAE0A - trainerbattle 5, 480, 0, Text_1C268D, Text_186612 + trainerbattle 5, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 msgbox Text_18661D, 6 end Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle 0, 481, 0, Text_1869BA, Text_1869E6 + trainerbattle 0, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAE48 @@ -6030,12 +6031,12 @@ Route15_EventScript_1AAE21:: @ 81AAE21 end EventScript_1AAE48:: @ 81AAE48 - trainerbattle 5, 481, 0, Text_1C2846, Text_1869E6 + trainerbattle 5, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 msgbox Text_1869F4, 6 end Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle 4, 488, 0, Text_186A95, Text_186ACB, Text_186B46 + trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAE8A @@ -6043,12 +6044,12 @@ Route15_EventScript_1AAE5F:: @ 81AAE5F end EventScript_1AAE8A:: @ 81AAE8A - trainerbattle 7, 488, 0, Text_1C28A1, Text_186ACB, Text_186B46 + trainerbattle 7, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 msgbox Text_186B0A, 6 end Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle 4, 488, 0, Text_186B89, Text_186BB1, Text_186BFE + trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAED0 @@ -6056,12 +6057,12 @@ Route15_EventScript_1AAEA5:: @ 81AAEA5 end EventScript_1AAED0:: @ 81AAED0 - trainerbattle 7, 488, 0, Text_1C28EC, Text_186BB1, Text_186BFE + trainerbattle 7, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE msgbox Text_186BD2, 6 end Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle 0, 199, 0, Text_186C4D, Text_186C5F + trainerbattle 0, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAF12 @@ -6069,12 +6070,12 @@ Route16_EventScript_1AAEEB:: @ 81AAEEB end EventScript_1AAF12:: @ 81AAF12 - trainerbattle 5, 199, 0, Text_1C2913, Text_186C5F + trainerbattle 5, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F msgbox Text_186C75, 6 end Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle 0, 201, 0, Text_186D39, Text_186D52 + trainerbattle 0, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAF50 @@ -6082,12 +6083,12 @@ Route16_EventScript_1AAF29:: @ 81AAF29 end EventScript_1AAF50:: @ 81AAF50 - trainerbattle 5, 201, 0, Text_1C297B, Text_186D52 + trainerbattle 5, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 msgbox Text_186D5A, 6 end Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle 0, 202, 0, Text_186E86, Text_186EB4 + trainerbattle 0, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAF8E @@ -6095,12 +6096,12 @@ Route16_EventScript_1AAF67:: @ 81AAF67 end EventScript_1AAF8E:: @ 81AAF8E - trainerbattle 5, 202, 0, Text_1C29EB, Text_186EB4 + trainerbattle 5, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 msgbox Text_186EC7, 6 end Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle 0, 249, 0, Text_186CA2, Text_186CBB + trainerbattle 0, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AAFCC @@ -6108,12 +6109,12 @@ Route16_EventScript_1AAFA5:: @ 81AAFA5 end EventScript_1AAFCC:: @ 81AAFCC - trainerbattle 5, 249, 0, Text_1C2925, Text_186CBB + trainerbattle 5, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB msgbox Text_186CC5, 6 end Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle 0, 250, 0, Text_186CE5, Text_186D06 + trainerbattle 0, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB00A @@ -6121,12 +6122,12 @@ Route16_EventScript_1AAFE3:: @ 81AAFE3 end EventScript_1AB00A:: @ 81AB00A - trainerbattle 5, 250, 0, Text_1C2944, Text_186D06 + trainerbattle 5, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 msgbox Text_186D16, 6 end Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle 0, 251, 0, Text_186DD9, Text_186E0D + trainerbattle 0, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB048 @@ -6134,12 +6135,12 @@ Route16_EventScript_1AB021:: @ 81AB021 end EventScript_1AB048:: @ 81AB048 - trainerbattle 5, 251, 0, Text_1C29B0, Text_186E0D + trainerbattle 5, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D msgbox Text_186E1C, 6 end Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle 4, 489, 0, Text_186FBD, Text_186FFA, Text_187057 + trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB08A @@ -6147,12 +6148,12 @@ Route16_EventScript_1AB05F:: @ 81AB05F end EventScript_1AB08A:: @ 81AB08A - trainerbattle 7, 489, 0, Text_1C2A19, Text_186FFA, Text_187057 + trainerbattle 7, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 msgbox Text_187027, 6 end Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle 4, 489, 0, Text_187097, Text_1870CC, Text_187120 + trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB0D0 @@ -6160,12 +6161,12 @@ Route16_EventScript_1AB0A5:: @ 81AB0A5 end EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle 7, 489, 0, Text_1C2A53, Text_1870CC, Text_187120 + trainerbattle 7, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 msgbox Text_1870F9, 6 end Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle 0, 203, 0, Text_1872BD, Text_1872E3 + trainerbattle 0, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB112 @@ -6173,12 +6174,12 @@ Route17_EventScript_1AB0EB:: @ 81AB0EB end EventScript_1AB112:: @ 81AB112 - trainerbattle 5, 203, 0, Text_1C2B06, Text_1872E3 + trainerbattle 5, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 msgbox Text_1872EB, 6 end Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle 0, 204, 0, Text_18730A, Text_187325 + trainerbattle 0, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB150 @@ -6186,12 +6187,12 @@ Route17_EventScript_1AB129:: @ 81AB129 end EventScript_1AB150:: @ 81AB150 - trainerbattle 5, 204, 0, Text_1C2B2C, Text_187325 + trainerbattle 5, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 msgbox Text_187333, 6 end Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle 0, 205, 0, Text_187456, Text_187472 + trainerbattle 0, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB18E @@ -6199,12 +6200,12 @@ Route17_EventScript_1AB167:: @ 81AB167 end EventScript_1AB18E:: @ 81AB18E - trainerbattle 5, 205, 0, Text_1C2BE6, Text_187472 + trainerbattle 5, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 msgbox Text_187479, 6 end Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle 0, 206, 0, Text_18749B, Text_1874B6 + trainerbattle 0, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB1CC @@ -6212,12 +6213,12 @@ Route17_EventScript_1AB1A5:: @ 81AB1A5 end EventScript_1AB1CC:: @ 81AB1CC - trainerbattle 5, 206, 0, Text_1C2C10, Text_1874B6 + trainerbattle 5, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 msgbox Text_1874C9, 6 end Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle 0, 252, 0, Text_18717E, Text_1871AE + trainerbattle 0, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB20A @@ -6225,12 +6226,12 @@ Route17_EventScript_1AB1E3:: @ 81AB1E3 end EventScript_1AB20A:: @ 81AB20A - trainerbattle 5, 252, 0, Text_1C2A88, Text_1871AE + trainerbattle 5, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE msgbox Text_1871BA, 6 end Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle 0, 253, 0, Text_187228, Text_187254 + trainerbattle 0, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB248 @@ -6238,12 +6239,12 @@ Route17_EventScript_1AB221:: @ 81AB221 end EventScript_1AB248:: @ 81AB248 - trainerbattle 5, 253, 0, Text_1C2AC4, Text_187254 + trainerbattle 5, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 msgbox Text_18725A, 6 end Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle 0, 254, 0, Text_187362, Text_187395 + trainerbattle 0, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB286 @@ -6251,12 +6252,12 @@ Route17_EventScript_1AB25F:: @ 81AB25F end EventScript_1AB286:: @ 81AB286 - trainerbattle 5, 254, 0, Text_1C2B5E, Text_187395 + trainerbattle 5, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 msgbox Text_18739F, 6 end Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle 0, 255, 0, Text_1873D1, Text_1873EB + trainerbattle 0, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB2C4 @@ -6264,12 +6265,12 @@ Route17_EventScript_1AB29D:: @ 81AB29D end EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle 5, 255, 0, Text_1C2B9C, Text_1873EB + trainerbattle 5, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB msgbox Text_1873FF, 6 end Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle 0, 256, 0, Text_18741D, Text_187429 + trainerbattle 0, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB302 @@ -6277,12 +6278,12 @@ Route17_EventScript_1AB2DB:: @ 81AB2DB end EventScript_1AB302:: @ 81AB302 - trainerbattle 5, 256, 0, Text_1C2BDA, Text_187429 + trainerbattle 5, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 msgbox Text_187432, 6 end Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle 0, 470, 0, Text_18727D, Text_187295 + trainerbattle 0, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB340 @@ -6290,12 +6291,12 @@ Route17_EventScript_1AB319:: @ 81AB319 end EventScript_1AB340:: @ 81AB340 - trainerbattle 5, 470, 0, Text_1C2AF0, Text_187295 + trainerbattle 5, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 msgbox Text_1872A5, 6 end Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle 0, 307, 0, Text_187640, Text_187672 + trainerbattle 0, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB37E @@ -6303,12 +6304,12 @@ Route18_EventScript_1AB357:: @ 81AB357 end EventScript_1AB37E:: @ 81AB37E - trainerbattle 5, 307, 0, Text_1C2C2B, Text_187672 + trainerbattle 5, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 msgbox Text_187677, 6 end Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle 0, 308, 0, Text_18768C, Text_1876B3 + trainerbattle 0, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB3BC @@ -6316,12 +6317,12 @@ Route18_EventScript_1AB395:: @ 81AB395 end EventScript_1AB3BC:: @ 81AB3BC - trainerbattle 5, 308, 0, Text_1C2C7B, Text_1876B3 + trainerbattle 5, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 msgbox Text_1876C5, 6 end Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle 0, 309, 0, Text_187704, Text_187726 + trainerbattle 0, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB3FA @@ -6329,12 +6330,12 @@ Route18_EventScript_1AB3D3:: @ 81AB3D3 end EventScript_1AB3FA:: @ 81AB3FA - trainerbattle 5, 309, 0, Text_1C2CA8, Text_187726 + trainerbattle 5, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 msgbox Text_18772C, 6 end Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle 0, 235, 0, Text_1877A3, Text_1877DF + trainerbattle 0, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB438 @@ -6342,12 +6343,12 @@ Route19_EventScript_1AB411:: @ 81AB411 end EventScript_1AB438:: @ 81AB438 - trainerbattle 5, 235, 0, Text_1C2CEE, Text_1877DF + trainerbattle 5, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF msgbox Text_1877EE, 6 end Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle 0, 236, 0, Text_187811, Text_18783E + trainerbattle 0, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB476 @@ -6355,12 +6356,12 @@ Route19_EventScript_1AB44F:: @ 81AB44F end EventScript_1AB476:: @ 81AB476 - trainerbattle 5, 236, 0, Text_1C2D19, Text_18783E + trainerbattle 5, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E msgbox Text_187852, 6 end Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle 0, 237, 0, Text_187884, Text_1878A5 + trainerbattle 0, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB4B4 @@ -6368,12 +6369,12 @@ Route19_EventScript_1AB48D:: @ 81AB48D end EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle 5, 237, 0, Text_1C2D4B, Text_1878A5 + trainerbattle 5, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 msgbox Text_1878B1, 6 end Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle 0, 238, 0, Text_1878DD, Text_1878F8 + trainerbattle 0, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB4F2 @@ -6381,12 +6382,12 @@ Route19_EventScript_1AB4CB:: @ 81AB4CB end EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle 5, 238, 0, Text_1C2D7D, Text_1878F8 + trainerbattle 5, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 msgbox Text_1878FE, 6 end Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle 0, 239, 0, Text_187925, Text_187955 + trainerbattle 0, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB530 @@ -6394,12 +6395,12 @@ Route19_EventScript_1AB509:: @ 81AB509 end EventScript_1AB530:: @ 81AB530 - trainerbattle 5, 239, 0, Text_1C2DA7, Text_187955 + trainerbattle 5, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 msgbox Text_18795B, 6 end Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle 0, 240, 0, Text_187985, Text_1879C3 + trainerbattle 0, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB56E @@ -6407,12 +6408,12 @@ Route19_EventScript_1AB547:: @ 81AB547 end EventScript_1AB56E:: @ 81AB56E - trainerbattle 5, 240, 0, Text_1C2DE9, Text_1879C3 + trainerbattle 5, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 msgbox Text_1879D3, 6 end Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle 0, 241, 0, Text_187AFA, Text_187B25 + trainerbattle 0, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB5AC @@ -6420,12 +6421,12 @@ Route19_EventScript_1AB585:: @ 81AB585 end EventScript_1AB5AC:: @ 81AB5AC - trainerbattle 5, 241, 0, Text_1C2EC0, Text_187B25 + trainerbattle 5, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 msgbox Text_187B35, 6 end Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle 0, 276, 0, Text_187A11, Text_187A44 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB5EA @@ -6433,12 +6434,12 @@ Route19_EventScript_1AB5C3:: @ 81AB5C3 end EventScript_1AB5EA:: @ 81AB5EA - trainerbattle 5, 276, 0, Text_1C2E4A, Text_187A44 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 msgbox Text_187A50, 6 end Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle 0, 277, 0, Text_187A9E, Text_187AC1 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB628 @@ -6446,12 +6447,12 @@ Route19_EventScript_1AB601:: @ 81AB601 end EventScript_1AB628:: @ 81AB628 - trainerbattle 5, 277, 0, Text_1C2E9D, Text_187AC1 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 msgbox Text_187ACA, 6 end Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle 0, 278, 0, Text_187B5D, Text_187B85 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB666 @@ -6459,12 +6460,12 @@ Route19_EventScript_1AB63F:: @ 81AB63F end EventScript_1AB666:: @ 81AB666 - trainerbattle 5, 278, 0, Text_1C2EFC, Text_187B85 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 msgbox Text_187B94, 6 end Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle 4, 490, 0, Text_187C32, Text_187C6F, Text_187CF2 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB6A8 @@ -6472,12 +6473,12 @@ Route19_EventScript_1AB67D:: @ 81AB67D end EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle 7, 490, 0, Text_1C2F41, Text_187C6F, Text_187CF2 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 msgbox Text_187C9E, 6 end Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle 4, 490, 0, Text_187D45, Text_187D7E, Text_187DE8 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB6EE @@ -6485,12 +6486,12 @@ Route19_EventScript_1AB6C3:: @ 81AB6C3 end EventScript_1AB6EE:: @ 81AB6EE - trainerbattle 7, 490, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 msgbox Text_187DAD, 6 end Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle 0, 242, 0, Text_187E40, Text_187E7B + trainerbattle 0, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB730 @@ -6498,12 +6499,12 @@ Route20_EventScript_1AB709:: @ 81AB709 end EventScript_1AB730:: @ 81AB730 - trainerbattle 5, 242, 0, Text_1C2FF3, Text_187E7B + trainerbattle 5, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B msgbox Text_187E83, 6 end Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle 0, 243, 0, Text_187FDB, Text_187FF7 + trainerbattle 0, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB76E @@ -6511,12 +6512,12 @@ Route20_EventScript_1AB747:: @ 81AB747 end EventScript_1AB76E:: @ 81AB76E - trainerbattle 5, 243, 0, Text_1C30B0, Text_187FF7 + trainerbattle 5, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 msgbox Text_187FFE, 6 end Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle 0, 244, 0, Text_18802E, Text_18805C + trainerbattle 0, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB7AC @@ -6524,12 +6525,12 @@ Route20_EventScript_1AB785:: @ 81AB785 end EventScript_1AB7AC:: @ 81AB7AC - trainerbattle 5, 244, 0, Text_1C30ED, Text_18805C + trainerbattle 5, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C msgbox Text_18806D, 6 end Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle 0, 270, 0, Text_187F24, Text_187F5A + trainerbattle 0, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB7EA @@ -6537,12 +6538,12 @@ Route20_EventScript_1AB7C3:: @ 81AB7C3 end EventScript_1AB7EA:: @ 81AB7EA - trainerbattle 5, 270, 0, Text_1C305F, Text_187F5A + trainerbattle 5, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A msgbox Text_187F61, 6 end Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle 0, 271, 0, Text_1880F8, Text_188119 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB828 @@ -6550,12 +6551,12 @@ Route20_EventScript_1AB801:: @ 81AB801 end EventScript_1AB828:: @ 81AB828 - trainerbattle 5, 271, 0, Text_1C3149, Text_188119 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 msgbox Text_188139, 6 end Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle 0, 272, 0, Text_188218, Text_18825C + trainerbattle 0, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB866 @@ -6563,12 +6564,12 @@ Route20_EventScript_1AB83F:: @ 81AB83F end EventScript_1AB866:: @ 81AB866 - trainerbattle 5, 272, 0, Text_1C31C4, Text_18825C + trainerbattle 5, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C msgbox Text_18827B, 6 end Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle 0, 279, 0, Text_187EBB, Text_187EED + trainerbattle 0, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB8A4 @@ -6576,12 +6577,12 @@ Route20_EventScript_1AB87D:: @ 81AB87D end EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle 5, 279, 0, Text_1C302E, Text_187EED + trainerbattle 5, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED msgbox Text_187EF6, 6 end Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle 0, 310, 0, Text_18808E, Text_1880AB + trainerbattle 0, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB8E2 @@ -6589,12 +6590,12 @@ Route20_EventScript_1AB8BB:: @ 81AB8BB end EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle 5, 310, 0, Text_1C312C, Text_1880AB + trainerbattle 5, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB msgbox Text_1880C8, 6 end Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle 0, 472, 0, Text_188165, Text_1881A3 + trainerbattle 0, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB920 @@ -6602,12 +6603,12 @@ Route20_EventScript_1AB8F9:: @ 81AB8F9 end EventScript_1AB920:: @ 81AB920 - trainerbattle 5, 472, 0, Text_1C3185, Text_1881A3 + trainerbattle 5, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 msgbox Text_1881B8, 6 end Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle 0, 473, 0, Text_187F78, Text_187F92 + trainerbattle 0, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB95E @@ -6615,12 +6616,12 @@ Route20_EventScript_1AB937:: @ 81AB937 end EventScript_1AB95E:: @ 81AB95E - trainerbattle 5, 473, 0, Text_1C3095, Text_187F92 + trainerbattle 5, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 msgbox Text_187FA3, 6 end Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle 0, 229, 0, Text_18835A, Text_188383 + trainerbattle 0, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB99C @@ -6628,12 +6629,12 @@ Route21_North_EventScript_1AB975:: @ 81AB975 end EventScript_1AB99C:: @ 81AB99C - trainerbattle 5, 229, 0, Text_1C3208, Text_188383 + trainerbattle 5, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 msgbox Text_188389, 6 end Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle 0, 230, 0, Text_1885D8, Text_1885F8 + trainerbattle 0, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AB9DA @@ -6641,12 +6642,12 @@ Route21_South_EventScript_1AB9B3:: @ 81AB9B3 end EventScript_1AB9DA:: @ 81AB9DA - trainerbattle 5, 230, 0, Text_1C331D, Text_1885F8 + trainerbattle 5, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 msgbox Text_188632, 6 end Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle 0, 231, 0, Text_1883C6, Text_1883E9 + trainerbattle 0, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABA18 @@ -6654,12 +6655,12 @@ Route21_North_EventScript_1AB9F1:: @ 81AB9F1 end EventScript_1ABA18:: @ 81ABA18 - trainerbattle 5, 231, 0, Text_1C3231, Text_1883E9 + trainerbattle 5, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 msgbox Text_18841D, 6 end Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle 0, 232, 0, Text_18868C, Text_1886AE + trainerbattle 0, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABA56 @@ -6667,12 +6668,12 @@ Route21_South_EventScript_1ABA2F:: @ 81ABA2F end EventScript_1ABA56:: @ 81ABA56 - trainerbattle 5, 232, 0, Text_1C3356, Text_1886AE + trainerbattle 5, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE msgbox Text_1886C5, 6 end Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle 0, 245, 0, Text_18843C, Text_18845F + trainerbattle 0, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABA94 @@ -6680,12 +6681,12 @@ Route21_North_EventScript_1ABA6D:: @ 81ABA6D end EventScript_1ABA94:: @ 81ABA94 - trainerbattle 5, 245, 0, Text_1C3264, Text_18845F + trainerbattle 5, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F msgbox Text_188465, 6 end Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle 0, 246, 0, Text_1884D4, Text_1884F0 + trainerbattle 0, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABAD2 @@ -6693,12 +6694,12 @@ Route21_South_EventScript_1ABAAB:: @ 81ABAAB end EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle 5, 246, 0, Text_1C3298, Text_1884F0 + trainerbattle 5, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 msgbox Text_1884FF, 6 end Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle 0, 247, 0, Text_18851F, Text_188543 + trainerbattle 0, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABB10 @@ -6706,12 +6707,12 @@ Route21_South_EventScript_1ABAE9:: @ 81ABAE9 end EventScript_1ABB10:: @ 81ABB10 - trainerbattle 5, 247, 0, Text_1C32D3, Text_188543 + trainerbattle 5, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 msgbox Text_188555, 6 end Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle 0, 248, 0, Text_188592, Text_1885B2 + trainerbattle 0, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABB4E @@ -6719,12 +6720,12 @@ Route21_South_EventScript_1ABB27:: @ 81ABB27 end EventScript_1ABB4E:: @ 81ABB4E - trainerbattle 5, 248, 0, Text_1C32FD, Text_1885B2 + trainerbattle 5, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 msgbox Text_1885BF, 6 end Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle 4, 491, 0, Text_1886E2, Text_188712, Text_18875E + trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABB90 @@ -6732,12 +6733,12 @@ Route21_North_EventScript_1ABB65:: @ 81ABB65 end EventScript_1ABB90:: @ 81ABB90 - trainerbattle 7, 491, 0, Text_1C3378, Text_188712, Text_18875E + trainerbattle 7, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E msgbox Text_188734, 6 end Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle 4, 491, 0, Text_1887B4, Text_1887F1, Text_188850 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABBD6 @@ -6745,12 +6746,12 @@ Route21_North_EventScript_1ABBAB:: @ 81ABBAB end EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle 7, 491, 0, Text_1C33AE, Text_1887F1, Text_188850 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 msgbox Text_188812, 6 end OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle 0, 547, 0, Text_18961F, Text_18964D + trainerbattle 0, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABC18 @@ -6758,12 +6759,12 @@ OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 end EventScript_1ABC18:: @ 81ABC18 - trainerbattle 5, 547, 0, Text_1C37B5, Text_18964D + trainerbattle 5, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D msgbox Text_189657, 6 end OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle 0, 548, 0, Text_18968C, Text_1896AC + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABC56 @@ -6771,12 +6772,12 @@ OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F end EventScript_1ABC56:: @ 81ABC56 - trainerbattle 5, 548, 0, Text_1C37E7, Text_1896AC + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC msgbox Text_1896C1, 6 end OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle 0, 549, 0, Text_1896F9, Text_189728 + trainerbattle 0, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABC94 @@ -6784,12 +6785,12 @@ OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D end EventScript_1ABC94:: @ 81ABC94 - trainerbattle 5, 549, 0, Text_1C3807, Text_189728 + trainerbattle 5, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 msgbox Text_189740, 6 end OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle 0, 550, 0, Text_189767, Text_1897A4 + trainerbattle 0, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABCD2 @@ -6797,12 +6798,12 @@ OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB end EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle 5, 550, 0, Text_1C3835, Text_1897A4 + trainerbattle 5, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 msgbox Text_1897C5, 6 end OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle 0, 551, 0, Text_1897FF, Text_189833 + trainerbattle 0, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABD10 @@ -6810,12 +6811,12 @@ OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 end EventScript_1ABD10:: @ 81ABD10 - trainerbattle 5, 551, 0, Text_1C386A, Text_189833 + trainerbattle 5, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 msgbox Text_18984B, 6 end OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle 0, 518, 0, Text_189883, Text_1898AB + trainerbattle 0, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABD4E @@ -6823,12 +6824,12 @@ OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 end EventScript_1ABD4E:: @ 81ABD4E - trainerbattle 5, 518, 0, Text_1C389F, Text_1898AB + trainerbattle 5, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB msgbox Text_1898C4, 6 end OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle 0, 552, 0, Text_1898F0, Text_18991B + trainerbattle 0, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABD8C @@ -6836,12 +6837,12 @@ OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 end EventScript_1ABD8C:: @ 81ABD8C - trainerbattle 5, 552, 0, Text_1C38CA, Text_18991B + trainerbattle 5, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B msgbox Text_18992C, 6 end OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle 0, 553, 0, Text_189950, Text_18998C + trainerbattle 0, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABDCA @@ -6849,12 +6850,12 @@ OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 end EventScript_1ABDCA:: @ 81ABDCA - trainerbattle 5, 553, 0, Text_1C38FA, Text_18998C + trainerbattle 5, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C msgbox Text_189998, 6 end OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle 0, 554, 0, Text_1899CE, Text_189A0A + trainerbattle 0, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABE08 @@ -6862,12 +6863,12 @@ OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 end EventScript_1ABE08:: @ 81ABE08 - trainerbattle 5, 554, 0, Text_1C3943, Text_189A0A + trainerbattle 5, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A msgbox Text_189A13, 6 end OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle 0, 555, 0, Text_189A53, Text_189A92 + trainerbattle 0, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABE46 @@ -6875,12 +6876,12 @@ OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F end EventScript_1ABE46:: @ 81ABE46 - trainerbattle 5, 555, 0, Text_1C3987, Text_189A92 + trainerbattle 5, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 msgbox Text_189A9F, 6 end OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle 0, 556, 0, Text_189ACB, Text_189B0B + trainerbattle 0, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABE84 @@ -6888,12 +6889,12 @@ OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D end EventScript_1ABE84:: @ 81ABE84 - trainerbattle 5, 556, 0, Text_1C39C6, Text_189B0B + trainerbattle 5, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B msgbox Text_189B24, 6 end OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle 4, 557, 0, Text_189B4D, Text_189B84, Text_189BDE + trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABEC6 @@ -6901,12 +6902,12 @@ OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B end EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle 7, 557, 0, Text_1C3A05, Text_189B84, Text_189BDE + trainerbattle 7, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE msgbox Text_189BA3, 6 end OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle 4, 557, 0, Text_189C33, Text_189C62, Text_189CAB + trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABF0C @@ -6914,12 +6915,12 @@ OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 end EventScript_1ABF0C:: @ 81ABF0C - trainerbattle 7, 557, 0, Text_1C3A55, Text_189C62, Text_189CAB + trainerbattle 7, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB msgbox Text_189C7E, 6 end OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle 0, 546, 0, Text_189D5A, Text_189D8B + trainerbattle 0, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABF4E @@ -6927,12 +6928,12 @@ OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 end EventScript_1ABF4E:: @ 81ABF4E - trainerbattle 5, 546, 0, Text_1C3773, Text_189D8B + trainerbattle 5, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B msgbox Text_189DA3, 6 end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle 0, 523, 0, Text_189E42, Text_189E72 + trainerbattle 0, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABF8C @@ -6940,12 +6941,12 @@ ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 end EventScript_1ABF8C:: @ 81ABF8C - trainerbattle 5, 523, 0, Text_1C3AA7, Text_189E72 + trainerbattle 5, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 msgbox Text_189E9E, 6 end ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle 0, 558, 0, Text_189ED4, Text_189EFA + trainerbattle 0, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ABFCA @@ -6953,12 +6954,12 @@ ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 end EventScript_1ABFCA:: @ 81ABFCA - trainerbattle 5, 558, 0, Text_1C3ABF, Text_189EFA + trainerbattle 5, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA msgbox Text_189F21, 6 end ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle 0, 519, 0, Text_189F63, Text_189F9A + trainerbattle 0, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC008 @@ -6966,12 +6967,12 @@ ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 end EventScript_1AC008:: @ 81AC008 - trainerbattle 5, 519, 0, Text_1C3AF2, Text_189F9A + trainerbattle 5, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A msgbox Text_189FA8, 6 end ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle 0, 559, 0, Text_189FDB, Text_189FEE + trainerbattle 0, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC046 @@ -6979,12 +6980,12 @@ ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F end EventScript_1AC046:: @ 81AC046 - trainerbattle 5, 559, 0, Text_1C3B1D, Text_189FEE + trainerbattle 5, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE msgbox Text_18A000, 6 end ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle 0, 561, 0, Text_18A01F, Text_18A053 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC084 @@ -6992,12 +6993,12 @@ ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D end EventScript_1AC084:: @ 81AC084 - trainerbattle 5, 561, 0, Text_1C3B30, Text_18A053 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 msgbox Text_18A082, 6 end ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle 4, 560, 0, Text_18A0C4, Text_18A0F7, Text_18A138 + trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC0C6 @@ -7005,12 +7006,12 @@ ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B end EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle 7, 560, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 + trainerbattle 7, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 msgbox Text_18A106, 6 end ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle 4, 560, 0, Text_18A179, Text_18A1A3, Text_18A1CD + trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC10C @@ -7018,12 +7019,12 @@ ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 end EventScript_1AC10C:: @ 81AC10C - trainerbattle 7, 560, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD + trainerbattle 7, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD msgbox Text_18A1B2, 6 end FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle 0, 526, 0, Text_18A3E2, Text_18A40E + trainerbattle 0, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC14E @@ -7031,12 +7032,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 end EventScript_1AC14E:: @ 81AC14E - trainerbattle 5, 526, 0, Text_1C3BF6, Text_18A40E + trainerbattle 5, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E msgbox Text_18A430, 6 end FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle 0, 562, 0, Text_18A461, Text_18A49E + trainerbattle 0, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC18C @@ -7044,12 +7045,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 end EventScript_1AC18C:: @ 81AC18C - trainerbattle 5, 562, 0, Text_1C3C28, Text_18A49E + trainerbattle 5, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E msgbox Text_18A4C6, 6 end FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle 0, 563, 0, Text_18A50E, Text_18A535 + trainerbattle 0, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC1CA @@ -7057,12 +7058,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 end EventScript_1AC1CA:: @ 81AC1CA - trainerbattle 5, 563, 0, Text_1C3C70, Text_18A535 + trainerbattle 5, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 msgbox Text_18A555, 6 end FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle 0, 525, 0, Text_18A5B9, Text_18A5EE + trainerbattle 0, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC208 @@ -7070,12 +7071,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 end EventScript_1AC208:: @ 81AC208 - trainerbattle 5, 525, 0, Text_1C3CB0, Text_18A5EE + trainerbattle 5, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE msgbox Text_18A601, 6 end FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle 0, 564, 0, Text_18A645, Text_18A67F + trainerbattle 0, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC246 @@ -7083,12 +7084,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F end EventScript_1AC246:: @ 81AC246 - trainerbattle 5, 564, 0, Text_1C3CF1, Text_18A67F + trainerbattle 5, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F msgbox Text_18A699, 6 end FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle 0, 565, 0, Text_18A6DA, Text_18A6FE + trainerbattle 0, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC284 @@ -7096,12 +7097,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D end EventScript_1AC284:: @ 81AC284 - trainerbattle 5, 565, 0, Text_1C3D47, Text_18A6FE + trainerbattle 5, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE msgbox Text_18A715, 6 end FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle 0, 566, 0, Text_18A74A, Text_18A786 + trainerbattle 0, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC2C2 @@ -7109,12 +7110,12 @@ FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B end EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle 5, 566, 0, Text_1C3D73, Text_18A786 + trainerbattle 5, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 msgbox Text_18A7AC, 6 end FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle 0, 520, 0, Text_18AAD5, Text_18AB0B + trainerbattle 0, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC300 @@ -7122,12 +7123,12 @@ FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 end EventScript_1AC300:: @ 81AC300 - trainerbattle 5, 520, 0, Text_1C3BB7, Text_18AB0B + trainerbattle 5, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B msgbox Text_18AB37, 6 end FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle 0, 570, 0, Text_18AE50, Text_18AEA8 + trainerbattle 0, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC33E @@ -7135,12 +7136,12 @@ FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 end EventScript_1AC33E:: @ 81AC33E - trainerbattle 5, 570, 0, Text_1C3DA2, Text_18AEA8 + trainerbattle 5, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 msgbox Text_18AEB6, 6 end FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle 0, 571, 0, Text_18AEDC, Text_18AF39 + trainerbattle 0, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC37C @@ -7148,12 +7149,12 @@ FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 end EventScript_1AC37C:: @ 81AC37C - trainerbattle 5, 571, 0, Text_1C3E0F, Text_18AF39 + trainerbattle 5, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 msgbox Text_18AF45, 6 end FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle 0, 572, 0, Text_18AF72, Text_18AFCC + trainerbattle 0, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC3BA @@ -7161,12 +7162,12 @@ FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 end EventScript_1AC3BA:: @ 81AC3BA - trainerbattle 5, 572, 0, Text_1C3E6A, Text_18AFCC + trainerbattle 5, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC msgbox Text_18AFF2, 6 end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 - trainerbattle 0, 573, 0, Text_18B400, Text_18B43B + trainerbattle 0, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC3F8 @@ -7174,12 +7175,12 @@ SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 end EventScript_1AC3F8:: @ 81AC3F8 - trainerbattle 5, 573, 0, Text_1C3ED0, Text_18B43B + trainerbattle 5, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B msgbox Text_18B451, 6 end SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F - trainerbattle 0, 574, 0, Text_18B48F, Text_18B4C5 + trainerbattle 0, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC436 @@ -7187,12 +7188,12 @@ SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F end EventScript_1AC436:: @ 81AC436 - trainerbattle 5, 574, 0, Text_1C3F11, Text_18B4C5 + trainerbattle 5, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 msgbox Text_18B4D1, 6 end SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D - trainerbattle 0, 575, 0, Text_18B4FA, Text_18B539 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC474 @@ -7200,12 +7201,12 @@ SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D end EventScript_1AC474:: @ 81AC474 - trainerbattle 5, 575, 0, Text_1C3F51, Text_18B539 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 msgbox Text_18B573, 6 end SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B - trainerbattle 4, 576, 0, Text_18B5C8, Text_18B5F4, Text_18B660 + trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC4B6 @@ -7213,12 +7214,12 @@ SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B end EventScript_1AC4B6:: @ 81AC4B6 - trainerbattle 7, 576, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 + trainerbattle 7, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 msgbox Text_18B62E, 6 end SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 - trainerbattle 4, 576, 0, Text_18B6C1, Text_18B6EF, Text_18B762 + trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC4FC @@ -7226,12 +7227,12 @@ SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 end EventScript_1AC4FC:: @ 81AC4FC - trainerbattle 7, 576, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 + trainerbattle 7, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 msgbox Text_18B720, 6 end SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 - trainerbattle 0, 517, 0, Text_18B7B0, Text_18B7F0 + trainerbattle 0, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC53E @@ -7239,12 +7240,12 @@ SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 end EventScript_1AC53E:: @ 81AC53E - trainerbattle 5, 517, 0, Text_1C3FE9, Text_18B7F0 + trainerbattle 5, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 msgbox Text_18B7FD, 6 end SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 - trainerbattle 0, 577, 0, Text_18B896, Text_18B8C8 + trainerbattle 0, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC57C @@ -7252,12 +7253,12 @@ SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 end EventScript_1AC57C:: @ 81AC57C - trainerbattle 5, 577, 0, Text_1C4028, Text_18B8C8 + trainerbattle 5, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 msgbox Text_18B8F7, 6 end SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 - trainerbattle 0, 291, 0, Text_18B959, Text_18B988 + trainerbattle 0, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC5BA @@ -7265,12 +7266,12 @@ SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 end EventScript_1AC5BA:: @ 81AC5BA - trainerbattle 5, 291, 0, Text_1C4057, Text_18B988 + trainerbattle 5, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 msgbox Text_18B9A5, 6 end SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 - trainerbattle 0, 578, 0, Text_18B9EC, Text_18BA47 + trainerbattle 0, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC5F8 @@ -7278,12 +7279,12 @@ SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 end EventScript_1AC5F8:: @ 81AC5F8 - trainerbattle 5, 578, 0, Text_1C407F, Text_18BA47 + trainerbattle 5, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 msgbox Text_18BA57, 6 end SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F - trainerbattle 0, 579, 0, Text_18BA86, Text_18BAC0 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC636 @@ -7291,12 +7292,12 @@ SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F end EventScript_1AC636:: @ 81AC636 - trainerbattle 5, 579, 0, Text_1C40D9, Text_18BAC0 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 msgbox Text_18BAE0, 6 end SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D - trainerbattle 4, 580, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 + trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC678 @@ -7304,12 +7305,12 @@ SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D end EventScript_1AC678:: @ 81AC678 - trainerbattle 7, 580, 0, Text_1C4138, Text_18BBE2, Text_18BC24 + trainerbattle 7, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 msgbox Text_18BBF6, 6 end SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 - trainerbattle 4, 580, 0, Text_18BC5A, Text_18BC84, Text_18BCCF + trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC6BE @@ -7317,12 +7318,12 @@ SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 end EventScript_1AC6BE:: @ 81AC6BE - trainerbattle 7, 580, 0, Text_1C4166, Text_18BC84, Text_18BCCF + trainerbattle 7, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF msgbox Text_18BCAE, 6 end SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 - trainerbattle 0, 581, 0, Text_18BB2D, Text_18BB62 + trainerbattle 0, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC700 @@ -7330,12 +7331,12 @@ SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 end EventScript_1AC700:: @ 81AC700 - trainerbattle 5, 581, 0, Text_1C40FA, Text_18BB62 + trainerbattle 5, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 msgbox Text_18BB8B, 6 end SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 - trainerbattle 0, 524, 0, Text_18BE5D, Text_18BE9B + trainerbattle 0, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC73E @@ -7343,12 +7344,12 @@ SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 end EventScript_1AC73E:: @ 81AC73E - trainerbattle 5, 524, 0, Text_1C4196, Text_18BE9B + trainerbattle 5, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B msgbox Text_18BEA0, 6 end SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 - trainerbattle 0, 582, 0, Text_18BF05, Text_18BF33 + trainerbattle 0, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC77C @@ -7356,12 +7357,12 @@ SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 end EventScript_1AC77C:: @ 81AC77C - trainerbattle 5, 582, 0, Text_1C41D4, Text_18BF33 + trainerbattle 5, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 msgbox Text_18BF6C, 6 end SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 - trainerbattle 0, 583, 0, Text_18BFC5, Text_18C03B + trainerbattle 0, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC7BA @@ -7369,12 +7370,12 @@ SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 end EventScript_1AC7BA:: @ 81AC7BA - trainerbattle 5, 583, 0, Text_1C4210, Text_18C03B + trainerbattle 5, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B msgbox Text_18C04C, 6 end SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 - trainerbattle 0, 584, 0, Text_18C09C, Text_18C0BB + trainerbattle 0, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC7F8 @@ -7382,12 +7383,12 @@ SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 end EventScript_1AC7F8:: @ 81AC7F8 - trainerbattle 5, 584, 0, Text_1C4280, Text_18C0BB + trainerbattle 5, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB msgbox Text_18C0EA, 6 end SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F - trainerbattle 0, 585, 0, Text_18C10A, Text_18C140 + trainerbattle 0, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC836 @@ -7395,12 +7396,12 @@ SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F end EventScript_1AC836:: @ 81AC836 - trainerbattle 5, 585, 0, Text_1C42A0, Text_18C140 + trainerbattle 5, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 msgbox Text_18C17A, 6 end SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D - trainerbattle 0, 586, 0, Text_18C1ED, Text_18C205 + trainerbattle 0, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC874 @@ -7408,12 +7409,12 @@ SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D end EventScript_1AC874:: @ 81AC874 - trainerbattle 5, 586, 0, Text_1C42D6, Text_18C205 + trainerbattle 5, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 msgbox Text_18C20E, 6 end SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B - trainerbattle 0, 587, 0, Text_18C283, Text_18C2BC + trainerbattle 0, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC8B2 @@ -7421,12 +7422,12 @@ SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B end EventScript_1AC8B2:: @ 81AC8B2 - trainerbattle 5, 587, 0, Text_1C42EE, Text_18C2BC + trainerbattle 5, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC msgbox Text_18C2D5, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 - trainerbattle 0, 588, 0, Text_18C3BC, Text_18C3E7 + trainerbattle 0, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC8F0 @@ -7434,12 +7435,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 end EventScript_1AC8F0:: @ 81AC8F0 - trainerbattle 5, 588, 0, Text_1C4327, Text_18C3E7 + trainerbattle 5, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 msgbox Text_18C3FF, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 - trainerbattle 4, 589, 0, Text_18C632, Text_18C662, Text_18C6AB + trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC932 @@ -7447,12 +7448,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 end EventScript_1AC932:: @ 81AC932 - trainerbattle 7, 589, 0, Text_1C4416, Text_18C662, Text_18C6AB + trainerbattle 7, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB msgbox Text_18C683, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D - trainerbattle 4, 589, 0, Text_18C700, Text_18C73B, Text_18C7BD + trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC978 @@ -7460,12 +7461,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D end EventScript_1AC978:: @ 81AC978 - trainerbattle 7, 589, 0, Text_1C444C, Text_18C73B, Text_18C7BD + trainerbattle 7, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD msgbox Text_18C773, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 - trainerbattle 0, 590, 0, Text_18C44B, Text_18C473 + trainerbattle 0, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC9BA @@ -7473,12 +7474,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 end EventScript_1AC9BA:: @ 81AC9BA - trainerbattle 5, 590, 0, Text_1C4374, Text_18C473 + trainerbattle 5, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 msgbox Text_18C4BA, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 - trainerbattle 0, 521, 0, Text_18C500, Text_18C543 + trainerbattle 0, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1AC9F8 @@ -7486,12 +7487,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 end EventScript_1AC9F8:: @ 81AC9F8 - trainerbattle 5, 521, 0, Text_1C43AD, Text_18C543 + trainerbattle 5, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 msgbox Text_18C54B, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F - trainerbattle 0, 522, 0, Text_18C5AA, Text_18C5CD + trainerbattle 0, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACA36 @@ -7499,12 +7500,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F end EventScript_1ACA36:: @ 81ACA36 - trainerbattle 5, 522, 0, Text_1C43EC, Text_18C5CD + trainerbattle 5, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD msgbox Text_18C5F5, 6 end SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D - trainerbattle 0, 591, 0, Text_18C887, Text_18C8A6 + trainerbattle 0, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACA74 @@ -7512,12 +7513,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D end EventScript_1ACA74:: @ 81ACA74 - trainerbattle 5, 591, 0, Text_1C4491, Text_18C8A6 + trainerbattle 5, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 msgbox Text_18C8C2, 6 end SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B - trainerbattle 0, 593, 0, Text_18C8FD, Text_18C980 + trainerbattle 0, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACAB2 @@ -7525,12 +7526,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B end EventScript_1ACAB2:: @ 81ACAB2 - trainerbattle 5, 593, 0, Text_1C44CB, Text_18C980 + trainerbattle 5, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 msgbox Text_18C999, 6 end SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 - trainerbattle 0, 596, 0, Text_18CA2F, Text_18CA6F + trainerbattle 0, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACAF0 @@ -7538,12 +7539,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 end EventScript_1ACAF0:: @ 81ACAF0 - trainerbattle 5, 596, 0, Text_1C454E, Text_18CA6F + trainerbattle 5, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F msgbox Text_18CA9C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 - trainerbattle 0, 598, 0, Text_18CB16, Text_18CB3E + trainerbattle 0, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACB2E @@ -7551,12 +7552,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 end EventScript_1ACB2E:: @ 81ACB2E - trainerbattle 5, 598, 0, Text_1C458E, Text_18CB3E + trainerbattle 5, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E msgbox Text_18CB6C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 - trainerbattle 0, 599, 0, Text_18CBB4, Text_18CBE0 + trainerbattle 0, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACB6C @@ -7564,12 +7565,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 end EventScript_1ACB6C:: @ 81ACB6C - trainerbattle 5, 599, 0, Text_1C45C2, Text_18CBE0 + trainerbattle 5, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 msgbox Text_18CC09, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 - trainerbattle 0, 600, 0, Text_18CC4F, Text_18CCAE + trainerbattle 0, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACBAA @@ -7577,12 +7578,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 end EventScript_1ACBAA:: @ 81ACBAA - trainerbattle 5, 600, 0, Text_1C45FB, Text_18CCAE + trainerbattle 5, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE msgbox Text_18CCEA, 6 end SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 - trainerbattle 4, 601, 0, Text_18CD49, Text_18CD75, Text_18CDE2 + trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACBEC @@ -7590,12 +7591,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 end EventScript_1ACBEC:: @ 81ACBEC - trainerbattle 7, 601, 0, Text_1C4662, Text_18CD75, Text_18CDE2 + trainerbattle 7, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 msgbox Text_18CD9C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 - trainerbattle 4, 601, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 + trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACC32 @@ -7603,12 +7604,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 end EventScript_1ACC32:: @ 81ACC32 - trainerbattle 7, 601, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 + trainerbattle 7, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 msgbox Text_18CE78, 6 end SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle 0, 602, 0, Text_18CFFB, Text_18D02A + trainerbattle 0, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACC74 @@ -7616,12 +7617,12 @@ SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D end EventScript_1ACC74:: @ 81ACC74 - trainerbattle 5, 602, 0, Text_1C46D3, Text_18D02A + trainerbattle 5, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A msgbox Text_18D061, 6 end SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle 0, 603, 0, Text_18D0D9, Text_18D108 + trainerbattle 0, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACCB2 @@ -7629,12 +7630,12 @@ SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B end EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle 5, 603, 0, Text_1C470A, Text_18D108 + trainerbattle 5, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 msgbox Text_18D125, 6 end SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle 0, 604, 0, Text_18D18F, Text_18D1B5 + trainerbattle 0, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACCF0 @@ -7642,12 +7643,12 @@ SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 end EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle 5, 604, 0, Text_1C4739, Text_18D1B5 + trainerbattle 5, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 msgbox Text_18D1E3, 6 end SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle 0, 605, 0, Text_18D22F, Text_18D26D + trainerbattle 0, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1ACD2E @@ -7655,7 +7656,7 @@ SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 end EventScript_1ACD2E:: @ 81ACD2E - trainerbattle 5, 605, 0, Text_1C476A, Text_18D26D + trainerbattle 5, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D msgbox Text_18D284, 6 end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 1ab7bcdf4..340d648bb 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -429,7 +429,7 @@ EventScript_16CABE:: @ 816CABE return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10 msgbox gUnknown_8196E9B, 6 end diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index a3e266ed3..9e9fb9543 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeladonCity_Gym_EventScript_16D061:: @ 816D061 setvar VAR_0x8004, 5 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 + trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 checkflag FLAG_0x293 goto_if 0, EventScript_16D0C6 setvar VAR_0x8004, 5 @@ -49,12 +49,12 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 + trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF + trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF setvar VAR_0x8004, 5 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars @@ -62,17 +62,17 @@ CeladonCity_Gym_EventScript_16D128:: @ 816D128 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle 0, 160, 0, Text_197595, Text_1975BB + trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle 0, 265, 0, Text_1974FA, Text_19751C + trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle 0, 266, 0, Text_19760B, Text_197660 + trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 setvar VAR_0x8004, 5 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars @@ -80,12 +80,12 @@ CeladonCity_Gym_EventScript_16D17A:: @ 816D17A end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle 0, 267, 0, Text_197747, Text_19777A + trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle 0, 402, 0, Text_1977E5, Text_197832 + trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 msgbox gUnknown_819783E, 6 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 658d2a393..a1b003f0c 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -75,15 +75,15 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle 3, 332, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_TERRY_7, 0, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle 3, 333, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_TERRY_8, 0, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle 3, 334, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_TERRY_9, 0, Text_17EB71 return EventScript_1665A3:: @ 81665A3 @@ -173,13 +173,13 @@ Movement_1665FB:: @ 81665FB CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag FLAG_0x163 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 goto_if_eq EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle 3, 355, 0, Text_17EE70 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 setvar VAR_0x407D, 1 goto EventScript_16662E end @@ -230,7 +230,7 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle 3, 355, 0, Text_17EE70 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 setvar VAR_0x407D, 1 goto EventScript_16662E end diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index b5d502041..f91e86b0f 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 + trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 checkflag FLAG_0x297 goto_if 0, EventScript_16AAF9 msgbox gUnknown_81922BF @@ -42,12 +42,12 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle 0, 150, 0, Text_192481, Text_1924D0 + trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle 0, 234, 0, Text_192524, Text_192547 + trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 249f4bc99..f0ca816b8 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -56,7 +56,7 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 + trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 checkflag FLAG_0x24E goto_if 0, EventScript_16DA34 msgbox gUnknown_819971D @@ -95,12 +95,12 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 + trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 msgbox gUnknown_81997EA, 6 end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 msgbox gUnknown_8199911, 6 end @@ -115,7 +115,7 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars @@ -133,7 +133,7 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 msgbox gUnknown_8199B27, 6 end @@ -148,7 +148,7 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 + trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 msgbox gUnknown_819987D, 6 end @@ -163,7 +163,7 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E + trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E msgbox gUnknown_8199986, 6 end @@ -178,7 +178,7 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A msgbox gUnknown_8199AC9, 6 end @@ -276,7 +276,7 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag FLAG_0x0D5 + checktrainerflag TRAINER_BURGLAR_QUINN goto_if 0, EventScript_16DC7A releaseall end @@ -288,7 +288,7 @@ EventScript_16DC7A:: @ 816DC7A call_if 1, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle 3, 213, 0, Text_199870 + trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870 checkflag FLAG_0x265 goto_if_eq EventScript_16DC68 call EventScript_16DC58 @@ -355,7 +355,7 @@ EventScript_16DD31:: @ 816DD31 EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag FLAG_0x0B2 + checktrainerflag TRAINER_SUPER_NERD_AVERY goto_if 0, EventScript_16DD51 releaseall end @@ -367,7 +367,7 @@ EventScript_16DD51:: @ 816DD51 call_if 1, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle 3, 178, 0, Text_1998ED + trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED checkflag FLAG_0x267 goto_if_eq EventScript_16DC68 call EventScript_16DD31 @@ -443,7 +443,7 @@ EventScript_16DE0F:: @ 816DE0F EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag FLAG_0x0D6 + checktrainerflag TRAINER_BURGLAR_RAMON goto_if 0, EventScript_16DE2F releaseall end @@ -455,7 +455,7 @@ EventScript_16DE2F:: @ 816DE2F call_if 1, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle 3, 214, 0, Text_199973 + trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973 checkflag FLAG_0x268 goto_if_eq EventScript_16DC68 call EventScript_16DE0F @@ -522,7 +522,7 @@ EventScript_16DEE6:: @ 816DEE6 EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag FLAG_0x0B3 + checktrainerflag TRAINER_SUPER_NERD_DEREK goto_if 0, EventScript_16DF06 releaseall end @@ -534,7 +534,7 @@ EventScript_16DF06:: @ 816DF06 call_if 1, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle 3, 179, 0, Text_1999DB + trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB checkflag FLAG_0x269 goto_if_eq EventScript_16DC68 call EventScript_16DEE6 @@ -601,7 +601,7 @@ EventScript_16DFBD:: @ 816DFBD EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag FLAG_0x0D7 + checktrainerflag TRAINER_BURGLAR_DUSTY goto_if 0, EventScript_16DFDD releaseall end @@ -613,7 +613,7 @@ EventScript_16DFDD:: @ 816DFDD call_if 1, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle 3, 215, 0, Text_199AB9 + trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 checkflag FLAG_0x26A goto_if_eq EventScript_16DC68 call EventScript_16DFBD @@ -680,7 +680,7 @@ EventScript_16E094:: @ 816E094 EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag FLAG_0x0B4 + checktrainerflag TRAINER_SUPER_NERD_ZAC goto_if 0, EventScript_16E0B4 releaseall end @@ -692,7 +692,7 @@ EventScript_16E0B4:: @ 816E0B4 call_if 1, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle 3, 180, 0, Text_199B16 + trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 checkflag FLAG_0x26B goto_if_eq EventScript_16DC68 call EventScript_16E094 diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 49ab5a14f..a5e25d092 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 + trainerbattle 0, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42 msgbox gUnknown_817CF54, 6 end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index cd21dbcbd..7ec208bd9 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 - checktrainerflag FLAG_0x25E + checktrainerflag TRAINER_LADY_SELPHY call_if 1, EventScript_164C42 end @@ -28,7 +28,7 @@ EventScript_164C52:: @ 8164C52 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_164CB6 - trainerbattle 3, 606, 0, Text_17D086 + trainerbattle 3, TRAINER_LADY_SELPHY, 0, Text_17D086 msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 @@ -45,7 +45,7 @@ EventScript_164CA5:: @ 8164CA5 return EventScript_164CB6:: @ 8164CB6 - settrainerflag FLAG_0x25E + settrainerflag TRAINER_LADY_SELPHY call EventScript_164CA5 releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 68104231a..4b73aecb8 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB + trainerbattle 0, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB msgbox gUnknown_817D037, 6 end diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 4b3b4d895..0caa8bcfe 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -39,16 +39,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB msgbox gUnknown_818AE16, 6 end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 490afe501..7e6a885b4 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D - checktrainerflag FLAG_0x21F + checktrainerflag TRAINER_TEAM_ROCKET_ADMIN call_if 1, EventScript_163F47 end @@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + trainerbattle 2, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD checkflag FLAG_0x844 goto_if_eq EventScript_163FB7 msgbox gUnknown_817BCA3, 6 @@ -64,17 +64,17 @@ EventScript_163FCD:: @ 8163FCD end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585 msgbox gUnknown_817B5A6, 6 end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9 msgbox gUnknown_817B6EF, 6 end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F msgbox gUnknown_817BA64, 6 end @@ -102,12 +102,12 @@ EventScript_164065:: @ 8164065 return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F msgbox gUnknown_817B642, 6 end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 msgbox gUnknown_817B7FA, 6 end diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 7054d0a18..06b8ed5e1 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 539, 0, Text_17B251 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 10c5cfed7..9411a85e5 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -5,7 +5,7 @@ FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E setvar VAR_0x8004, 6 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 + trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 checkflag FLAG_0x259 goto_if 0, EventScript_16D5A6 msgbox gUnknown_8198481 @@ -42,17 +42,17 @@ EventScript_16D5E7:: @ 816D5E7 end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle 0, 294, 0, Text_198866, Text_1988B6 + trainerbattle 0, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6 msgbox gUnknown_81988CB, 6 end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle 0, 295, 0, Text_19891F, Text_19897F + trainerbattle 0, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F msgbox gUnknown_8198985, 6 end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle 0, 288, 0, Text_19871E, Text_198779 + trainerbattle 0, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779 setvar VAR_0x8004, 6 setvar VAR_0x8005, 2 special SetFlavorTextFlagFromSpecialVars @@ -60,17 +60,17 @@ FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA + trainerbattle 0, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA msgbox gUnknown_8198A10, 6 end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle 0, 292, 0, Text_198629, Text_1986B4 + trainerbattle 0, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4 msgbox gUnknown_81986C9, 6 end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle 0, 293, 0, Text_1987E8, Text_198812 + trainerbattle 0, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812 msgbox gUnknown_8198825, 6 end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index acd440a97..198a0e1c0 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -25,7 +25,7 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock - checktrainerflag FLAG_0x219 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 goto_if_eq EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1639A8 @@ -43,9 +43,9 @@ EventScript_1639A8:: @ 81639A8 waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 - trainerbattle 3, 537, 0, Text_17AA34 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 msgbox gUnknown_817AA3F - checktrainerflag FLAG_0x21A + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 goto_if_eq EventScript_1639DB release end @@ -63,7 +63,7 @@ EventScript_1639DB:: @ 81639DB MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer - checktrainerflag FLAG_0x21A + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 goto_if_eq EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_163A25 @@ -82,9 +82,9 @@ EventScript_163A1B:: @ 8163A1B EventScript_163A25:: @ 8163A25 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 - trainerbattle 3, 538, 0, Text_17AA8A + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A msgbox gUnknown_817AA99 - checktrainerflag FLAG_0x219 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 goto_if_eq EventScript_1639DB release end @@ -116,16 +116,16 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA + trainerbattle 0, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA msgbox gUnknown_817ABD8, 6 end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 + trainerbattle 0, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82 msgbox gUnknown_817ACA2, 6 end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B + trainerbattle 0, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B msgbox gUnknown_817AD89, 6 end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index cd8feb26c..df67e7c8a 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle 0, 181, 0, Text_17279D, Text_1727CB + trainerbattle 0, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB msgbox gUnknown_81727DF, 6 end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle 0, 91, 0, Text_17281D, Text_172844 + trainerbattle 0, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844 msgbox gUnknown_8172863, 6 end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle 0, 120, 0, Text_172896, Text_1728C3 + trainerbattle 0, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3 msgbox gUnknown_81728D2, 6 end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle 0, 121, 0, Text_172972, Text_1729A4 + trainerbattle 0, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4 msgbox gUnknown_81729AC, 6 end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle 0, 169, 0, Text_17290B, Text_172927 + trainerbattle 0, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927 msgbox gUnknown_817293C, 6 end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A + trainerbattle 0, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A msgbox gUnknown_8172A26, 6 end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle 0, 109, 0, Text_172A55, Text_172A8F + trainerbattle 0, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F msgbox gUnknown_8172A97, 6 end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index c8cf811c0..9ffc6b1e0 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -25,7 +25,7 @@ MtMoon_B2F_EventScript_1606C2:: @ 81606C2 faceplayer checkflag FLAG_0x232 goto_if_eq EventScript_160707 - checktrainerflag FLAG_0x0AA + checktrainerflag TRAINER_SUPER_NERD_MIGUEL goto_if_eq EventScript_160711 call EventScript_1606DD release @@ -38,7 +38,7 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 170, 0, Text_172B99 + trainerbattle 3, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 setvar VAR_0x408B, 1 msgbox gUnknown_8172BAB return @@ -123,21 +123,21 @@ Movement_1607E0:: @ 81607E0 step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 msgbox gUnknown_8172CCB, 6 end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 msgbox gUnknown_8172D51, 6 end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle 0, 353, 0, Text_172D82, Text_172DAF + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF msgbox gUnknown_8172DC1, 6 end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E msgbox gUnknown_8172E4B, 6 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index aea5e8a38..7ddae81ca 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -347,7 +347,7 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -403,7 +403,7 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY_3, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -462,7 +462,7 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY_2, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 48864bf53..f23729456 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -5,7 +5,7 @@ PewterCity_Gym_EventScript_16A593:: @ 816A593 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 + trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 checkflag FLAG_0x254 goto_if 0, EventScript_16A5F3 msgbox gUnknown_819110F @@ -44,7 +44,7 @@ EventScript_16A634:: @ 816A634 end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle 0, 142, 0, Text_1911EC, Text_191237 + trainerbattle 0, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237 msgbox gUnknown_819126B, 6 end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 0157b4196..904002c30 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -86,11 +86,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle 3, 412, 0, Text_1786D7 + trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle 3, 737, 0, Text_1786D7 + trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 return EventScript_162911:: @ 8162911 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 2fd9264a4..747833135 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -83,11 +83,11 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle 3, 411, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle 3, 736, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 return EventScript_162779:: @ 8162779 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 43c11e705..67b68616d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -16,23 +16,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 end EventScript_162B1E:: @ 8162B1E - checktrainerflag FLAG_0x1B6 + checktrainerflag TRAINER_CHAMPION_TERRY goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E3 + checktrainerflag TRAINER_CHAMPION_TERRY_4 goto_if_eq EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag FLAG_0x1B7 + checktrainerflag TRAINER_CHAMPION_TERRY_2 goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E4 + checktrainerflag TRAINER_CHAMPION_TERRY_5 goto_if_eq EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag FLAG_0x1B8 + checktrainerflag TRAINER_CHAMPION_TERRY_3 goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E5 + checktrainerflag TRAINER_CHAMPION_TERRY_6 goto_if_eq EventScript_162B57 return @@ -142,27 +142,27 @@ EventScript_162CBC:: @ 8162CBC return EventScript_162CC5:: @ 8162CC5 - trainerbattle 3, 438, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY, 0, Text_178E3F return EventScript_162CD0:: @ 8162CD0 - trainerbattle 3, 439, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY_2, 0, Text_178E3F return EventScript_162CDB:: @ 8162CDB - trainerbattle 3, 440, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY_3, 0, Text_178E3F return EventScript_162CE6:: @ 8162CE6 - trainerbattle 3, 739, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY_4, 0, Text_178E3F return EventScript_162CF1:: @ 8162CF1 - trainerbattle 3, 740, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY_5, 0, Text_178E3F return EventScript_162CFC:: @ 8162CFC - trainerbattle 3, 741, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_TERRY_6, 0, Text_178E3F return Movement_162D07:: @ 8162D07 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 8d7fe2451..0b46c0fa1 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -137,11 +137,11 @@ EventScript_162A82:: @ 8162A82 return EventScript_162A8B:: @ 8162A8B - trainerbattle 3, 413, 0, Text_178A15 + trainerbattle 3, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15 return EventScript_162A96:: @ 8162A96 - trainerbattle 3, 738, 0, Text_178A15 + trainerbattle 3, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15 return EventScript_162AA1:: @ 8162AA1 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 60e2b5086..0f0db575e 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -88,11 +88,11 @@ EventScript_16264A:: @ 816264A return EventScript_162653:: @ 8162653 - trainerbattle 3, 410, 0, Text_178191 + trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191 return EventScript_16265E:: @ 816265E - trainerbattle 3, 735, 0, Text_178191 + trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191 return EventScript_162669:: @ 8162669 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 04a15a5e5..73a502e68 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -23,11 +23,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle 0, 335, 0, Text_177364, Text_177391 + trainerbattle 0, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD + trainerbattle 0, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD msgbox gUnknown_8177418, 6 end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index b9f052a4f..ca69db5c1 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -26,6 +26,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281 end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle 0, 216, 0, Text_177498, Text_1774CB + trainerbattle 0, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB msgbox gUnknown_81774E3, 6 end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 4fb9e8bf0..6aaa14918 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -22,11 +22,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle 0, 218, 0, Text_1775E7, Text_177602 + trainerbattle 0, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602 msgbox gUnknown_8177608, 6 end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle 0, 346, 0, Text_177628, Text_177643 + trainerbattle 0, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643 msgbox gUnknown_8177657, 6 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 0997ae9f9..923fac42d 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -22,11 +22,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320 end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 + trainerbattle 0, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7 msgbox gUnknown_81776DE, 6 end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle 0, 347, 0, Text_177720, Text_177757 + trainerbattle 0, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757 msgbox gUnknown_817776A, 6 end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 929c24f60..9706ca26c 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B return EventScript_16335D:: @ 816335D - trainerbattle 3, 429, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_TERRY_13, 0, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle 3, 430, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_TERRY_14, 0, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle 3, 431, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_TERRY_15, 0, Text_179D73 return EventScript_16337E:: @ 816337E diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 30591aba5..8549cd256 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC + trainerbattle 0, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC msgbox gUnknown_8179FD3, 6 end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle 0, 442, 0, Text_179F62, Text_179F72 + trainerbattle 0, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72 msgbox gUnknown_8179F88, 6 end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle 0, 443, 0, Text_179F09, Text_179F21 + trainerbattle 0, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21 msgbox gUnknown_8179F31, 6 end diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 0837c5b9b..0047e6060 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle 0, 444, 0, Text_17A004, Text_17A017 + trainerbattle 0, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017 msgbox gUnknown_817A02B, 6 end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle 0, 445, 0, Text_17A046, Text_17A061 + trainerbattle 0, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061 msgbox gUnknown_817A067, 6 end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB + trainerbattle 0, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB msgbox gUnknown_817A0BB, 6 end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 67c6b27f4..0e6d48bc4 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 + trainerbattle 0, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132 msgbox gUnknown_817A138, 6 end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle 0, 448, 0, Text_17A150, Text_17A164 + trainerbattle 0, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164 msgbox gUnknown_817A176, 6 end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle 0, 449, 0, Text_17A187, Text_17A190 + trainerbattle 0, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190 msgbox gUnknown_817A194, 6 end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 + trainerbattle 0, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7 msgbox gUnknown_817A1BD, 6 end diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index dd2bdff80..69f324b83 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -36,16 +36,16 @@ Movement_163512:: @ 8163512 step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle 0, 451, 0, Text_17A243, Text_17A253 + trainerbattle 0, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 msgbox gUnknown_817A25A, 6 end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle 0, 452, 0, Text_17A272, Text_17A27F + trainerbattle 0, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F msgbox gUnknown_817A293, 6 end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC + trainerbattle 0, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC msgbox gUnknown_817A2E2, 6 end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 7f319287e..396b408af 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -18,7 +18,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 msgbox gUnknown_817A3AF, 6 end @@ -105,7 +105,7 @@ Movement_163633:: @ 8163633 step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658 msgbox gUnknown_817A477, 6 end @@ -173,7 +173,7 @@ Movement_1636CD:: @ 81636CD step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 msgbox gUnknown_817A506, 6 end diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 846154c97..f16127dc0 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle 0, 192, 0, Text_179366, Text_179388 + trainerbattle 0, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388 msgbox gUnknown_8179396, 6 end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle 0, 193, 0, Text_1793F1, Text_17940E + trainerbattle 0, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E msgbox gUnknown_817943A, 6 end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle 0, 194, 0, Text_17947B, Text_1794AC + trainerbattle 0, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC msgbox gUnknown_81794B4, 6 end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE + trainerbattle 0, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE msgbox gUnknown_81794F9, 6 end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle 0, 476, 0, Text_17951C, Text_179547 + trainerbattle 0, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547 msgbox gUnknown_8179558, 6 end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle 0, 475, 0, Text_1795E5, Text_179604 + trainerbattle 0, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604 msgbox gUnknown_8179613, 6 end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle 0, 474, 0, Text_179577, Text_1795A1 + trainerbattle 0, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1 msgbox gUnknown_81795B5, 6 end diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 12611a767..7ca22dde0 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle 0, 158, 0, Text_179657, Text_1796B9 + trainerbattle 0, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9 msgbox gUnknown_81796CE, 6 end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD + trainerbattle 0, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD msgbox gUnknown_81798E9, 6 end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle 0, 189, 0, Text_1796E1, Text_179700 + trainerbattle 0, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700 msgbox gUnknown_8179712, 6 end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle 0, 190, 0, Text_179829, Text_179856 + trainerbattle 0, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856 msgbox gUnknown_817987A, 6 end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle 0, 191, 0, Text_179916, Text_179932 + trainerbattle 0, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932 msgbox gUnknown_817993E, 6 end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle 0, 164, 0, Text_17973A, Text_17975F + trainerbattle 0, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F msgbox gUnknown_8179777, 6 end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB + trainerbattle 0, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB msgbox gUnknown_81797DE, 6 end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle 0, 166, 0, Text_179968, Text_179997 + trainerbattle 0, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997 msgbox gUnknown_81799AC, 6 end diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 1b4068e14..d3aa5a382 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,7 +4,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag FLAG_0x16A + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 call_if 0, EventScript_161233 end @@ -13,27 +13,27 @@ RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle 0, 358, 0, Text_174ECA, Text_174EED + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED msgbox gUnknown_8174EFA, 6 end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 msgbox gUnknown_8174F66, 6 end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 msgbox gUnknown_8174FB3, 6 end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 msgbox gUnknown_8175007, 6 end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 msgbox gUnknown_8175060, 6 end diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 80c102179..e3ed4b499 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle 0, 363, 0, Text_17508C, Text_1750BF + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF msgbox gUnknown_81750CC, 6 end diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 82fc7aa26..d322a36fb 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle 0, 364, 0, Text_17511A, Text_17514A + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A msgbox gUnknown_817515B, 6 end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle 0, 365, 0, Text_17519E, Text_1751CE + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE msgbox gUnknown_81751E0, 6 end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index f56e0a211..f5092c97c 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -4,9 +4,9 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 5, EventScript_16146A @@ -26,7 +26,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle 3, 348, 0, Text_175318 + trainerbattle 3, TRAINER_BOSS_GIOVANNI, 0, Text_175318 msgbox gUnknown_817532D fadescreen 1 closemessage @@ -52,7 +52,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D msgbox gUnknown_81754BD release end @@ -76,15 +76,15 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 msgbox gUnknown_817540C, 6 end EventScript_1613E9:: @ 81613E9 setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1614A1 @@ -94,15 +94,15 @@ EventScript_1613E9:: @ 81613E9 end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433 msgbox gUnknown_817546A, 6 end EventScript_161433:: @ 8161433 setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 call_if 1, EventScript_161311 compare_var_to_value VAR_0x4001, 2 call_if 1, EventScript_1614A1 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 6df018f2f..d7855e45e 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B return EventScript_16836D:: @ 816836D - trainerbattle 9, 329, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY_4, 0, Text_188959, Text_18DE1A return EventScript_16837C:: @ 816837C - trainerbattle 9, 330, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY_5, 0, Text_188959, Text_18DE1A return EventScript_16838B:: @ 816838B - trainerbattle 9, 331, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_TERRY_6, 0, Text_188959, Text_18DE1A return EventScript_16839A:: @ 816839A @@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7 return EventScript_1684B9:: @ 81684B9 - trainerbattle 3, 435, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_TERRY_19, 0, Text_188B08 return EventScript_1684C4:: @ 81684C4 - trainerbattle 3, 436, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_TERRY_20, 0, Text_188B08 return EventScript_1684CF:: @ 81684CF - trainerbattle 3, 437, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_TERRY_21, 0, Text_188B08 return Movement_1684DA:: @ 81684DA diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index dede3df50..e2af4628c 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -60,7 +60,7 @@ EventScript_1686B9:: @ 81686B9 playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle 3, 356, 0, Text_188DDC + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC msgbox gUnknown_8188DF1 setvar VAR_0x406B, 1 return diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 4f1ef996b..9e37f8eb8 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -6,11 +6,11 @@ SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F + trainerbattle 0, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F msgbox gUnknown_8173A7A, 6 end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle 0, 96, 0, Text_173999, Text_1739B1 + trainerbattle 0, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1 msgbox gUnknown_81739C5, 6 end diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 553a72b52..3d42c7860 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA + trainerbattle 0, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA msgbox gUnknown_8173C30, 6 end diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index bc6e0cd88..560764b08 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 + trainerbattle 0, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4 msgbox gUnknown_8173CC4, 6 end diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 12871cff0..79ee7db7d 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA return EventScript_1609DC:: @ 81609DC - trainerbattle 3, 426, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_TERRY_10, 0, Text_173110 return EventScript_1609E7:: @ 81609E7 - trainerbattle 3, 427, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_TERRY_11, 0, Text_173110 return EventScript_1609F2:: @ 81609F2 - trainerbattle 3, 428, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_TERRY_12, 0, Text_173110 return EventScript_1609FD:: @ 81609FD diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index cb18a010a..af5c392c2 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 + trainerbattle 0, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7 msgbox gUnknown_8173E04, 6 end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle 0, 482, 0, Text_173D63, Text_173D92 + trainerbattle 0, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92 msgbox gUnknown_8173DB6, 6 end diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 26efb8bd5..506059759 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle 0, 483, 0, Text_173F07, Text_173F42 + trainerbattle 0, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42 msgbox gUnknown_8173F55, 6 end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle 0, 127, 0, Text_173F83, Text_173FAB + trainerbattle 0, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB msgbox gUnknown_8173FB9, 6 end diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index ec931102e..337066e8c 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle 0, 224, 0, Text_174177, Text_1741EF + trainerbattle 0, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF msgbox gUnknown_817420E, 6 end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle 0, 140, 0, Text_1740F6, Text_174123 + trainerbattle 0, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123 msgbox gUnknown_817413A, 6 end diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 71acf74be..04c9b1c33 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle 0, 138, 0, Text_174239, Text_17425C + trainerbattle 0, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C msgbox gUnknown_8174272, 6 end diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index 3a1ff97c6..fcf19823a 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 + trainerbattle 0, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3 msgbox gUnknown_81742D2, 6 end diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 02860ab54..8a6b8fa8c 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle 0, 136, 0, Text_174315, Text_174348 + trainerbattle 0, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348 msgbox gUnknown_8174362, 6 end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle 0, 137, 0, Text_174385, Text_1743B3 + trainerbattle 0, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3 msgbox gUnknown_81743C8, 6 end diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 3f835e568..bf12690af 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -14,11 +14,11 @@ SSAnne_Deck_EventScript_160A7B:: @ 8160A7B end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle 0, 134, 0, Text_173308, Text_17332B + trainerbattle 0, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B msgbox gUnknown_817333E, 6 end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle 0, 135, 0, Text_173382, Text_1733A0 + trainerbattle 0, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0 msgbox gUnknown_81733B5, 6 end diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8be7e27a6..1ec8ae42a 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -123,27 +123,27 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F + trainerbattle 0, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD + trainerbattle 0, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle 0, 320, 0, Text_19B341, Text_19B396 + trainerbattle 0, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle 0, 318, 0, Text_19B275, Text_19B292 + trainerbattle 0, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 + trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 checkflag FLAG_0x278 goto_if_eq EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index f181b502c..7973c7748 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 setvar VAR_0x8004, 7 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A + trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A checkflag FLAG_0x29A goto_if 0, EventScript_16EE3D msgbox gUnknown_819B7F2 @@ -45,12 +45,12 @@ EventScript_16EE7E:: @ 816EE7E end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle 0, 280, 0, Text_19B936, Text_19B957 + trainerbattle 0, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957 msgbox gUnknown_819B96D, 6 end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E + trainerbattle 0, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 special SetFlavorTextFlagFromSpecialVars @@ -58,27 +58,27 @@ SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 + trainerbattle 0, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1 msgbox gUnknown_819BBB3, 6 end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC + trainerbattle 0, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC msgbox gUnknown_819BCC4, 6 end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 + trainerbattle 0, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8 msgbox gUnknown_819B8B9, 6 end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC + trainerbattle 0, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC msgbox gUnknown_819B9F7, 6 end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D + trainerbattle 0, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D msgbox gUnknown_819BB1F, 6 end diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index dea6b7af4..637ab2ba4 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -26,11 +26,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7 end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle 0, 345, 0, Text_176D57, Text_176D73 + trainerbattle 0, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 msgbox gUnknown_8176D86, 6 end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle 0, 389, 0, Text_176CED, Text_176D18 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 msgbox gUnknown_8176D25, 6 end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 3eade43f5..de4820653 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -77,7 +77,7 @@ EventScript_161EA0:: @ 8161EA0 compare_var_to_value VAR_0x4001, 1 call_if 1, EventScript_161F12 setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 349, 0, Text_1771AB + trainerbattle 3, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB msgbox gUnknown_81771C2 closemessage fadescreen 1 @@ -134,11 +134,11 @@ SilphCo_11F_EventScript_161F37:: @ 8161F37 end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7 msgbox gUnknown_81772F9, 6 end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle 0, 391, 0, Text_17726A, Text_17728C + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C msgbox gUnknown_817729B, 6 end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 309ee5d13..c969b91c3 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -20,21 +20,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660 end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle 0, 336, 0, Text_175562, Text_17557E + trainerbattle 0, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 + trainerbattle 0, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle 0, 373, 0, Text_17562D, Text_17564A + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 msgbox gUnknown_81756E2, 6 end diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index d4b7458ce..517fdaa39 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -28,11 +28,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle 0, 338, 0, Text_175948, Text_17597D + trainerbattle 0, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle 0, 375, 0, Text_1758F6, Text_175911 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 msgbox gUnknown_817591C, 6 end diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 884f2e410..794d2294a 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -28,16 +28,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770 end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 + trainerbattle 0, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle 0, 377, 0, Text_175B19, Text_175B2B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B msgbox gUnknown_8175B38, 6 end diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index e17c791b9..327aede13 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -42,21 +42,21 @@ SilphCo_5F_EventScript_16181C:: @ 816181C end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle 0, 340, 0, Text_175C40, Text_175C6D + trainerbattle 0, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D msgbox gUnknown_8175C7D, 6 end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09 msgbox gUnknown_8175C0F, 6 end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle 0, 379, 0, Text_175D28, Text_175D4B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B msgbox gUnknown_8175D59, 6 end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB + trainerbattle 0, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB msgbox gUnknown_8175CF9, 6 end diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index caeedd216..7a9bc4c5a 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -82,16 +82,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936 end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle 0, 341, 0, Text_176136, Text_1761BD + trainerbattle 0, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD msgbox gUnknown_81761C4, 6 end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle 0, 380, 0, Text_1760DE, Text_176104 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 msgbox gUnknown_817610F, 6 end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle 0, 381, 0, Text_1761F1, Text_17620E + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E msgbox gUnknown_817621B, 6 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 22fd4114c..6795c72d5 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -83,15 +83,15 @@ EventScript_161A7F:: @ 8161A7F return EventScript_161A80:: @ 8161A80 - trainerbattle 3, 432, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_TERRY_16, 0, Text_1767D0 return EventScript_161A8B:: @ 8161A8B - trainerbattle 3, 433, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_TERRY_17, 0, Text_1767D0 return EventScript_161A96:: @ 8161A96 - trainerbattle 3, 434, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_TERRY_18, 0, Text_1767D0 return EventScript_161AA1:: @ 8161AA1 @@ -243,21 +243,21 @@ SilphCo_7F_EventScript_161BFA:: @ 8161BFA end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle 0, 342, 0, Text_1765E2, Text_17660C + trainerbattle 0, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C msgbox gUnknown_8176616, 6 end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle 0, 383, 0, Text_176643, Text_176669 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669 msgbox gUnknown_8176681, 6 end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7 msgbox gUnknown_81766E5, 6 end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle 0, 385, 0, Text_176586, Text_1765A5 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5 msgbox gUnknown_81765B1, 6 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 99112ee5e..7fb3d75d0 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -26,16 +26,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90 end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 + trainerbattle 0, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle 0, 386, 0, Text_176A56, Text_176A7C + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C msgbox gUnknown_8176A90, 6 end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 530ae7c1a..5342e9f6b 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -35,16 +35,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38 end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B + trainerbattle 0, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 msgbox gUnknown_8176CB8, 6 end diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 9682f1cbe..33d4d315c 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2 msgbox gUnknown_818B3C8, 6 end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 0575b4855..4655002aa 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587 return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + trainerbattle 0, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66 msgbox gUnknown_817BF97, 6 end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + trainerbattle 0, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028 msgbox gUnknown_817C056, 6 end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + trainerbattle 0, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2 msgbox gUnknown_817C113, 6 end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + trainerbattle 0, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196 msgbox gUnknown_817C1D0, 6 end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + trainerbattle 0, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275 msgbox gUnknown_817C2A4, 6 end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + trainerbattle 0, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D msgbox gUnknown_817C31C, 6 end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + trainerbattle 0, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5 msgbox gUnknown_817C3CE, 6 end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + trainerbattle 0, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458 msgbox gUnknown_817C490, 6 end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + trainerbattle 0, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552 msgbox gUnknown_817C590, 6 end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + trainerbattle 0, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609 msgbox gUnknown_817C615, 6 end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + trainerbattle 0, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660 msgbox gUnknown_817C68E, 6 end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + trainerbattle 0, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB msgbox gUnknown_817C728, 6 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 39a3688fe..346d5b6a2 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -227,7 +227,7 @@ EventScript_167A59:: @ 8167A59 goto_if_eq EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 - trainerbattle 3, 527, 0, Text_1824B7 + trainerbattle 3, TRAINER_BIKER_GOON, 0, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 msgbox gUnknown_81824CF @@ -237,7 +237,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 - trainerbattle 3, 528, 0, Text_182521 + trainerbattle 3, TRAINER_BIKER_GOON_2, 0, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 msgbox gUnknown_8182536 @@ -247,7 +247,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 529, 0, Text_1825D4 + trainerbattle 3, TRAINER_BIKER_GOON_3, 0, Text_1825D4 applymovement 4, Movement_1A75E7 waitmovement 0 applymovement 6, Movement_1A75ED @@ -269,7 +269,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 742, 0, Text_1826B7 + trainerbattle 3, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7 msgbox gUnknown_818271D closemessage fadescreen 1 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 19268f551..4ea4afc22 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -211,7 +211,7 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A setvar VAR_0x8004, 4 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C + trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C checkflag FLAG_0x231 goto_if 0, EventScript_16B9AF msgbox gUnknown_8194C8E @@ -254,7 +254,7 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 + trainerbattle 0, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 setvar VAR_0x8004, 4 setvar VAR_0x8005, 4 special SetFlavorTextFlagFromSpecialVars @@ -262,12 +262,12 @@ VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F + trainerbattle 0, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + trainerbattle 2, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D setvar VAR_0x8004, 4 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 1406ef4e5..564573c38 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle 0, 406, 0, Text_174710, Text_174738 + trainerbattle 0, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 msgbox gUnknown_8174744, 6 end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle 0, 396, 0, Text_174784, Text_1747B8 + trainerbattle 0, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 msgbox gUnknown_81747C8, 6 end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ba4d835f4..01d89cdc6 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035 end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle 0, 167, 0, Text_1747EF, Text_17482C + trainerbattle 0, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C msgbox gUnknown_817483E, 6 end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle 0, 325, 0, Text_174877, Text_1748B4 + trainerbattle 0, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4 msgbox gUnknown_81748BB, 6 end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle 0, 287, 0, Text_1748EE, Text_17491B + trainerbattle 0, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B msgbox gUnknown_8174927, 6 end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle 0, 290, 0, Text_174995, Text_1749B0 + trainerbattle 0, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0 msgbox gUnknown_81749BB, 6 end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle 0, 298, 0, Text_174942, Text_17495A + trainerbattle 0, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A msgbox gUnknown_8174969, 6 end diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 1a4c42953..aa1abb783 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101 end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle 0, 393, 0, Text_174B60, Text_174B83 + trainerbattle 0, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83 msgbox gUnknown_8174B99, 6 end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 + trainerbattle 0, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9 msgbox gUnknown_8174CBD, 6 end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle 0, 403, 0, Text_174C30, Text_174C5A + trainerbattle 0, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A msgbox gUnknown_8174C67, 6 end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 + trainerbattle 0, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4 msgbox gUnknown_8174C03, 6 end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 + trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96 msgbox gUnknown_8174D64, 6 end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D + trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D msgbox gUnknown_8174E48, 6 end diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 85a4f1ea1..1789b183e 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -5,7 +5,7 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA setvar VAR_0x8004, 15 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 + trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 checkflag FLAG_0x298 goto_if 0, EventScript_169F2F msgbox gUnknown_818F4A2 @@ -47,42 +47,42 @@ EventScript_169F70:: @ 8169F70 end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 + trainerbattle 0, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824 msgbox gUnknown_818F840, 6 end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB + trainerbattle 0, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB msgbox gUnknown_818F9CC, 6 end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 + trainerbattle 0, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6 msgbox gUnknown_818F7DD, 6 end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 + trainerbattle 0, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899 msgbox gUnknown_818F8A0, 6 end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A + trainerbattle 0, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A msgbox gUnknown_818F960, 6 end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D + trainerbattle 0, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D msgbox gUnknown_818FA3B, 6 end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 + trainerbattle 0, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769 msgbox gUnknown_818F77B, 6 end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE + trainerbattle 0, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE msgbox gUnknown_818F8FE, 6 end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index bf8438d65..f4e4ee898 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -39,26 +39,26 @@ ViridianForest_EventScript_160568:: @ 8160568 end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 + trainerbattle 0, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9 msgbox gUnknown_8172315, 6 end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle 0, 103, 0, Text_17234A, Text_17237D + trainerbattle 0, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D msgbox gUnknown_8172398, 6 end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle 0, 104, 0, Text_1723D4, Text_172402 + trainerbattle 0, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402 msgbox gUnknown_817241F, 6 end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle 0, 531, 0, Text_172482, Text_1724BF + trainerbattle 0, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF msgbox gUnknown_81724DC, 6 end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle 0, 532, 0, Text_1724F9, Text_17251B + trainerbattle 0, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B msgbox gUnknown_8172527, 6 end |