diff options
Diffstat (limited to 'data/maps/Route113/scripts.inc')
| -rw-r--r-- | data/maps/Route113/scripts.inc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 58c769273..721fab1fb 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81505CC - map_script 5, Route113_MapScript1_1505D7 - map_script 3, Route113_MapScript1_1505DA + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1505D7 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1505DA .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 @@ -9,7 +9,7 @@ Route113_MapScript1_1505D7:: @ 81505D7 Route113_MapScript1_1505DA:: @ 81505DA call Route113_EventScript_1505E5 - call Route113_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end Route113_EventScript_1505E5:: @ 81505E5 @@ -25,76 +25,76 @@ Route113_EventScript_150604:: @ 8150604 return Route113_EventScript_150605:: @ 8150605 - msgbox Route113_Text_16FF7F, 2 + msgbox Route113_Text_16FF7F, MSGBOX_NPC end Route113_EventScript_15060E:: @ 815060E - msgbox Route113_Text_16FFEE, 2 + msgbox Route113_Text_16FFEE, MSGBOX_NPC end Route113_EventScript_150617:: @ 8150617 - msgbox Route113_Text_170065, 3 + msgbox Route113_Text_170065, MSGBOX_SIGN end Route113_EventScript_150620:: @ 8150620 - msgbox Route113_Text_17007B, 3 + msgbox Route113_Text_17007B, MSGBOX_SIGN end Route113_EventScript_150629:: @ 8150629 - msgbox Route113_Text_17011D, 3 + msgbox Route113_Text_17011D, MSGBOX_SIGN end Route113_EventScript_150632:: @ 8150632 - msgbox Route113_Text_170096, 3 + msgbox Route113_Text_170096, MSGBOX_SIGN end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 - msgbox Route113_Text_1BB9FB, 6 + trainerbattle_single TRAINER_NEAL, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + msgbox Route113_Text_1BB9FB, MSGBOX_AUTOCLOSE end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B - msgbox Route113_Text_1BBAB7, 6 + trainerbattle_single TRAINER_DILLON, Route113_Text_1BBA62, Route113_Text_1BBA9B + msgbox Route113_Text_1BBAB7, MSGBOX_AUTOCLOSE end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_150690 - msgbox Route113_Text_1BBB9A, 6 + msgbox Route113_Text_1BBB9A, MSGBOX_AUTOCLOSE end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D - msgbox Route113_Text_1BBC1C, 6 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_1BBBCE, Route113_Text_1BBC0D + msgbox Route113_Text_1BBC1C, MSGBOX_AUTOCLOSE end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle_single TRAINER_LAO_1, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_1506CE - msgbox Route113_Text_1BBCAB, 6 + msgbox Route113_Text_1BBCAB, MSGBOX_AUTOCLOSE end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D - msgbox Route113_Text_1BBD38, 6 + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_1BBCE6, Route113_Text_1BBD1D + msgbox Route113_Text_1BBD38, MSGBOX_AUTOCLOSE end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 - msgbox Route113_Text_1BBE1D, 6 + trainerbattle_single TRAINER_LUNG, Route113_Text_1BBD92, Route113_Text_1BBDC6 + msgbox Route113_Text_1BBE1D, MSGBOX_AUTOCLOSE end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 - msgbox Route113_Text_1BBEE4, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + msgbox Route113_Text_1BBEE4, MSGBOX_AUTOCLOSE end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 - msgbox Route113_Text_1BBFE2, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + msgbox Route113_Text_1BBFE2, MSGBOX_AUTOCLOSE end |