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 /data/maps | |
| parent | 4d8f66774e791bd6d30023b41fed7f2e00b0edac (diff) | |
Assign trainer consts to script cmd args
Diffstat (limited to 'data/maps')
72 files changed, 289 insertions, 289 deletions
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 |