diff options
Diffstat (limited to 'data/maps/Route111/scripts.inc')
| -rw-r--r-- | data/maps/Route111/scripts.inc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 08d4cb48e..f03dc38ac 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -288,7 +288,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 applymovement 1, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -306,7 +306,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 applymovement 2, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -324,7 +324,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 applymovement 3, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -342,7 +342,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage applymovement 4, Route111_Movement_2725A6 @@ -452,27 +452,27 @@ Route111_EventScript_1F11E4:: @ 81F11E4 end Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A + trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 + trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 + trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF + trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB @@ -489,27 +489,27 @@ Route111_EventScript_1F128C:: @ 81F128C end Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E + trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 @@ -526,12 +526,12 @@ Route111_EventScript_1F1333:: @ 81F1333 end Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 @@ -548,42 +548,42 @@ Route111_EventScript_1F1395:: @ 81F1395 end Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE + trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D + trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 + trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 + trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 + trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E - trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 + trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end |