diff options
35 files changed, 83 insertions, 304 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index a1b0b0c62..e59f18b32 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1554,3 +1554,10 @@ setorcopyvar 0x8000, \decoration callstd STD_OBTAIN_DECORATION .endm + + .macro register_matchcall trainer + setvar VAR_0x8004, \trainer + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, \trainer + callstd STD_REGISTER_MATCH_CALL + .endm diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index c6eb6779b..0c5a9ce8b 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -12,10 +12,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KIRA_AND_DAN_1 release end @@ -35,10 +32,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KIRA_AND_DAN_1 release end diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index ad036da3b..94665168a 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -23,10 +23,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF special sub_80B4808 waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT - setvar VAR_0x8004, 144 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 144 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_THALIA_1 release end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 8a464b16e..99e5910d1 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -114,10 +114,7 @@ JaggedPass_EventScript_23079C:: @ 823079C JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT - setvar VAR_0x8004, 474 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 474 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DIANA_1 release end @@ -138,10 +135,7 @@ JaggedPass_EventScript_2307FB:: @ 82307FB JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT - setvar VAR_0x8004, 216 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 216 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ETHAN_1 release end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 492edb063..df62fe313 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -14,10 +14,7 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_NICOLAS_1 release end @@ -37,10 +34,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JOHN_AND_JAY_1 release end @@ -60,10 +54,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JOHN_AND_JAY_1 release end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f5f7eb482..480f91515 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -499,10 +499,7 @@ MtChimney_EventScript_22F176:: @ 822F176 special sub_80B4808 waitmovement 0 msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT - setvar VAR_0x8004, 313 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 313 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_SHELBY_1 release end @@ -544,10 +541,7 @@ MtChimney_EventScript_22F234:: @ 822F234 special sub_80B4808 waitmovement 0 msgbox MtChimney_Text_230557, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 1 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_SAWYER_1 release end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 01a31a6ae..7c84290de 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -24,10 +24,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_GABRIELLE_1 release end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 943e0f31f..c82827d4f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -14,10 +14,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_VALERIE_1 release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7b804d2c6..81ad5ad3d 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -300,10 +300,7 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JAMES_1 release end @@ -316,10 +313,7 @@ PetalburgWoods_EventScript_22E2EF:: @ 822E2EF PetalburgWoods_EventScript_22E302:: @ 822E302 msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JAMES_1 release end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index c38d40a7f..ca6de7d9c 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -40,10 +40,7 @@ Route102_EventScript_1EC146:: @ 81EC146 Route102_EventScript_1EC157:: @ 81EC157 msgbox Route102_Text_294668, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_1 release end @@ -56,10 +53,7 @@ Route102_EventScript_1EC170:: @ 81EC170 Route102_EventScript_1EC183:: @ 81EC183 msgbox Route102_Text_2945EB, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_1 release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 58a1fc124..2f9c12207 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -217,10 +217,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B Route103_EventScript_1EC63A:: @ 81EC63A msgbox Route103_Text_294B8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_AMY_AND_LIV_1 release end @@ -239,10 +236,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E Route103_EventScript_1EC69D:: @ 81EC69D msgbox Route103_Text_294B8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_AMY_AND_LIV_1 release end @@ -269,10 +263,7 @@ Route103_EventScript_1EC714:: @ 81EC714 special sub_80B4808 waitmovement 0 msgbox Route103_Text_294F7E, MSGBOX_DEFAULT - setvar VAR_0x8004, 293 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 293 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MIGUEL_1 release end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 790eaf303..70c6d33cc 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -903,10 +903,7 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE Route104_EventScript_1ED3DF:: @ 81ED3DF msgbox Route104_Text_29576B, MSGBOX_DEFAULT - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_HALEY_1 release end @@ -919,10 +916,7 @@ Route104_EventScript_1ED3F8:: @ 81ED3F8 Route104_EventScript_1ED40B:: @ 81ED40B msgbox Route104_Text_2956FF, MSGBOX_DEFAULT - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_HALEY_1 release end @@ -954,10 +948,7 @@ Route104_EventScript_1ED47C:: @ 81ED47C Route104_EventScript_1ED48D:: @ 81ED48D msgbox Route104_Text_29595A, MSGBOX_DEFAULT - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WINSTON_1 release end @@ -970,10 +961,7 @@ Route104_EventScript_1ED4A6:: @ 81ED4A6 Route104_EventScript_1ED4B9:: @ 81ED4B9 msgbox Route104_Text_2958F8, MSGBOX_DEFAULT - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WINSTON_1 release end @@ -1005,10 +993,7 @@ Route104_EventScript_1ED52A:: @ 81ED52A Route104_EventScript_1ED53B:: @ 81ED53B msgbox Route104_Text_295B60, MSGBOX_DEFAULT - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CINDY_1 release end @@ -1021,10 +1006,7 @@ Route104_EventScript_1ED554:: @ 81ED554 Route104_EventScript_1ED567:: @ 81ED567 msgbox Route104_Text_295B01, MSGBOX_DEFAULT - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CINDY_1 release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 55d5a45c2..a96c5c58f 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -74,10 +74,7 @@ Route105_EventScript_1EE300:: @ 81EE300 special sub_80B4808 waitmovement 0 msgbox Route105_Text_296159, MSGBOX_DEFAULT - setvar VAR_0x8004, 737 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 737 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANDRES_1 release end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ee211773a..4187ae136 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -28,10 +28,7 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED special sub_80B4808 waitmovement 0 msgbox Route106_Text_2963E3, MSGBOX_DEFAULT - setvar VAR_0x8004, 339 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 339 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ELLIOT_1 release end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 4762fcd06..25c11feb0 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -19,10 +19,7 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8 special sub_80B4808 waitmovement 0 msgbox Route107_Text_29685A, MSGBOX_DEFAULT - setvar VAR_0x8004, 155 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 155 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TONY_1 release end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index c5c1dbccb..a833dcc5f 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -39,10 +39,7 @@ Route108_EventScript_1EE729:: @ 81EE729 special sub_80B4808 waitmovement 0 msgbox Route108_Text_296FD8, MSGBOX_DEFAULT - setvar VAR_0x8004, 740 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 740 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CORY_1 release end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index dff0800ac..d90e423ff 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -408,10 +408,7 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5 special sub_80B4808 waitmovement 0 msgbox Route109_Text_2973C1, MSGBOX_DEFAULT - setvar VAR_0x8004, 64 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 64 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_RICKY_1 release end @@ -433,10 +430,7 @@ Route109_EventScript_1EEB27:: @ 81EEB27 special sub_80B4808 waitmovement 0 msgbox Route109_Text_297520, MSGBOX_DEFAULT - setvar VAR_0x8004, 57 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 57 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LOLA_1 release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 3652f7685..09dd38c69 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -187,10 +187,7 @@ Route110_EventScript_1EF44C:: @ 81EF44C special sub_80B4808 waitmovement 0 msgbox Route110_Text_298201, MSGBOX_DEFAULT - setvar VAR_0x8004, 512 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 512 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_EDWIN_1 release end @@ -227,10 +224,7 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3 special sub_80B4808 waitmovement 0 msgbox Route110_Text_297CFE, MSGBOX_DEFAULT - setvar VAR_0x8004, 353 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 353 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BENJAMIN_1 release end @@ -257,10 +251,7 @@ Route110_EventScript_1EF56C:: @ 81EF56C special sub_80B4808 waitmovement 0 msgbox Route110_Text_297ECD, MSGBOX_DEFAULT - setvar VAR_0x8004, 358 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 358 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ABIGAIL_1 release end @@ -282,10 +273,7 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE special sub_80B4808 waitmovement 0 msgbox Route110_Text_2983EE, MSGBOX_DEFAULT - setvar VAR_0x8004, 302 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 302 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISABEL_1 release end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c7b5457d0..08d4cb48e 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -484,10 +484,7 @@ Route111_EventScript_1F128C:: @ 81F128C special sub_80B4808 waitmovement 0 msgbox Route111_Text_298C00, MSGBOX_DEFAULT - setvar VAR_0x8004, 44 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 44 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DUSTY_1 release end @@ -524,10 +521,7 @@ Route111_EventScript_1F1333:: @ 81F1333 special sub_80B4808 waitmovement 0 msgbox Route111_Text_29903D, MSGBOX_DEFAULT - setvar VAR_0x8004, 78 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 78 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WILTON_1 release end @@ -549,10 +543,7 @@ Route111_EventScript_1F1395:: @ 81F1395 special sub_80B4808 waitmovement 0 msgbox Route111_Text_29921D, MSGBOX_DEFAULT - setvar VAR_0x8004, 94 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 94 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BROOKE_1 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index d23efddd8..ec18e56da 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -78,10 +78,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 msgbox Route112_Text_29993C, MSGBOX_DEFAULT - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TRENT_1 release end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 76d4b7f1c..35611fd6a 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -71,10 +71,7 @@ Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 msgbox Route113_Text_299F49, MSGBOX_DEFAULT - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MADELINE_1 release end @@ -96,10 +93,7 @@ Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LAO_1 release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 931cca4de..6e702be1c 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -121,10 +121,7 @@ Route114_EventScript_1F26C8:: @ 81F26C8 special sub_80B4808 waitmovement 0 msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT - setvar VAR_0x8004, 143 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 143 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_STEVE_1 release end @@ -146,10 +143,7 @@ Route114_EventScript_1F272A:: @ 81F272A special sub_80B4808 waitmovement 0 msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT - setvar VAR_0x8004, 206 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 206 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BERNIE_1 release end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7921b09ee..37763c1e1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -49,10 +49,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TIMOTHY_1 release end @@ -79,10 +76,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B50B, MSGBOX_DEFAULT - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_NOB_1 release end @@ -104,10 +98,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CYNDY_1 release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index f5892bb86..4e5c8892f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -280,10 +280,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 special sub_80B4808 waitmovement 0 msgbox Route116_Text_29BE71, MSGBOX_DEFAULT - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JERRY_1 release end @@ -296,10 +293,7 @@ Route116_EventScript_1F2F22:: @ 81F2F22 Route116_EventScript_1F2F35:: @ 81F2F35 msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JERRY_1 release end @@ -341,10 +335,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF special sub_80B4808 waitmovement 0 msgbox Route116_Text_29C096, MSGBOX_DEFAULT - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KAREN_1 release end @@ -357,10 +348,7 @@ Route116_EventScript_1F2FFE:: @ 81F2FFE Route116_EventScript_1F3011:: @ 81F3011 msgbox Route116_Text_29C052, MSGBOX_DEFAULT - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KAREN_1 release end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 8bb600acc..12e6651fe 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -51,10 +51,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C508, MSGBOX_DEFAULT - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAAC_1 release end @@ -76,10 +73,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LYDIA_1 release end @@ -101,10 +95,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C846, MSGBOX_DEFAULT - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DYLAN_1 release end @@ -126,10 +117,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29CA32, MSGBOX_DEFAULT - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MARIA_1 release end @@ -154,10 +142,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F Route117_EventScript_1F3B9F:: @ 81F3B9F msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end @@ -177,10 +162,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 Route117_EventScript_1F3C03:: @ 81F3C03 msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 8448504a1..56ec024a1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -199,10 +199,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D343, MSGBOX_DEFAULT - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ROSE_1 release end @@ -234,10 +231,7 @@ Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D74A, MSGBOX_DEFAULT - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DALTON_1 release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 6c5e8b504..36ad9115d 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -379,10 +379,7 @@ Route119_EventScript_1F483C:: @ 81F483C special sub_80B4808 waitmovement 0 msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT - setvar VAR_0x8004, 552 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 552 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JACKSON_1 release end @@ -404,10 +401,7 @@ Route119_EventScript_1F489E:: @ 81F489E special sub_80B4808 waitmovement 0 msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT - setvar VAR_0x8004, 559 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 559 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CATHERINE_1 release end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6360a54a3..6b41400d5 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -308,10 +308,7 @@ Route120_EventScript_1F581A:: @ 81F581A special sub_80B4808 waitmovement 0 msgbox Route120_Text_29E75D, MSGBOX_DEFAULT - setvar VAR_0x8004, 406 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 406 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ROBERT_1 release end @@ -343,10 +340,7 @@ Route120_EventScript_1F58AA:: @ 81F58AA special sub_80B4808 waitmovement 0 msgbox Route120_Text_29EA31, MSGBOX_DEFAULT - setvar VAR_0x8004, 226 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 226 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JEFFREY_1 release end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1bd917450..9c683c70d 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -83,10 +83,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F25B, MSGBOX_DEFAULT - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WALTER_1 release end @@ -123,10 +120,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F69F, MSGBOX_DEFAULT - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JESSICA_1 release end @@ -168,10 +162,7 @@ Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F80D, MSGBOX_DEFAULT - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CRISTIN_1 release end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 052405704..5e0f97493 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -73,10 +73,7 @@ Route123_EventScript_1F6236:: @ 81F6236 special sub_80B4808 waitmovement 0 msgbox Route123_Text_29FE70, MSGBOX_DEFAULT - setvar VAR_0x8004, 238 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 238 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CAMERON_1 release end @@ -98,10 +95,7 @@ Route123_EventScript_1F6298:: @ 81F6298 special sub_80B4808 waitmovement 0 msgbox Route123_Text_2A0027, MSGBOX_DEFAULT - setvar VAR_0x8004, 249 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 249 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JACKI_1 release end @@ -173,10 +167,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8 special sub_80B4808 waitmovement 0 msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT - setvar VAR_0x8004, 195 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 195 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_FERNANDO_1 release end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 013171cbd..530e0703a 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -34,10 +34,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JENNY_1 release end @@ -67,10 +64,7 @@ Route124_EventScript_1F6643:: @ 81F6643 Route124_EventScript_1F6673:: @ 81F6673 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end @@ -90,10 +84,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 Route124_EventScript_1F66D7:: @ 81F66D7 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c1771a83b..b2061f325 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -59,10 +59,7 @@ Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT - setvar VAR_0x8004, 492 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 492 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ERNEST_1 release end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index d3679eb54..a773feb2b 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -55,10 +55,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3 special sub_80B4808 waitmovement 0 msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT - setvar VAR_0x8004, 377 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 377 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_PABLO_1 release end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 33d3e808e..399e7a428 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -74,10 +74,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 special sub_80B4808 waitmovement 0 msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT - setvar VAR_0x8004, 672 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 672 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KOJI_1 release end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2a686a865..0d7a8587c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -188,10 +188,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2916, MSGBOX_DEFAULT - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAIAH_1 release end @@ -213,10 +210,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KATELYN_1 release end |