diff options
Diffstat (limited to 'data/maps/Route117/scripts.inc')
| -rw-r--r-- | data/maps/Route117/scripts.inc | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 363b19280..1fb14e10b 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 8150D3A - map_script 3, Route117_MapScript1_150D40 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_150D40 .byte 0 Route117_MapScript1_150D40:: @ 8150D40 @@ -14,108 +14,108 @@ Route117_EventScript_150D56:: @ 8150D56 return Route117_EventScript_150D57:: @ 8150D57 - msgbox Route117_Text_170CA7, 2 + msgbox Route117_Text_170CA7, MSGBOX_NPC end Route117_EventScript_150D60:: @ 8150D60 - msgbox Route117_Text_170CEB, 2 + msgbox Route117_Text_170CEB, MSGBOX_NPC end Route117_EventScript_150D69:: @ 8150D69 - msgbox Route117_Text_170C26, 2 + msgbox Route117_Text_170C26, MSGBOX_NPC end Route117_EventScript_150D72:: @ 8150D72 - msgbox Route117_Text_170D02, 3 + msgbox Route117_Text_170D02, MSGBOX_SIGN end Route117_EventScript_150D7B:: @ 8150D7B - msgbox Route117_Text_170D1E, 3 + msgbox Route117_Text_170D1E, MSGBOX_SIGN end Route117_EventScript_150D84:: @ 8150D84 - msgbox Route117_Text_170D38, 3 + msgbox Route117_Text_170D38, MSGBOX_SIGN end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DB4 - msgbox Route117_Text_1BD4F9, 6 + msgbox Route117_Text_1BD4F9, MSGBOX_AUTOCLOSE end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB - msgbox Route117_Text_1BD5F2, 6 + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_1BD569, Route117_Text_1BD5AB + msgbox Route117_Text_1BD5F2, MSGBOX_AUTOCLOSE end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_1BD634, Route117_Text_1BD67B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DF2 - msgbox Route117_Text_1BD69B, 6 + msgbox Route117_Text_1BD69B, MSGBOX_AUTOCLOSE end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 - msgbox Route117_Text_1BD74F, 6 + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_1BD6F2, Route117_Text_1BD733 + msgbox Route117_Text_1BD74F, MSGBOX_AUTOCLOSE end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E30 - msgbox Route117_Text_1BD7F5, 6 + msgbox Route117_Text_1BD7F5, MSGBOX_AUTOCLOSE end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 - msgbox Route117_Text_1BD8BD, 6 + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_1BD83F, Route117_Text_1BD8A2 + msgbox Route117_Text_1BD8BD, MSGBOX_AUTOCLOSE end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_1BD914, Route117_Text_1BD965 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E6E - msgbox Route117_Text_1BD98F, 6 + msgbox Route117_Text_1BD98F, MSGBOX_AUTOCLOSE end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 - msgbox Route117_Text_1BDA6B, 6 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_1BD9F1, Route117_Text_1BDA41 + msgbox Route117_Text_1BDA6B, MSGBOX_AUTOCLOSE end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC - msgbox Route117_Text_1BDB24, 6 + trainerbattle_single TRAINER_DEREK, Route117_Text_1BDAA7, Route117_Text_1BDAFC + msgbox Route117_Text_1BDB24, MSGBOX_AUTOCLOSE end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150EC7 - msgbox Route117_Text_1BDC44, 6 + msgbox Route117_Text_1BDC44, MSGBOX_AUTOCLOSE end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 - msgbox Route117_Text_1BDE55, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + msgbox Route117_Text_1BDE55, MSGBOX_AUTOCLOSE end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150F0D - msgbox Route117_Text_1BDD4E, 6 + msgbox Route117_Text_1BDD4E, MSGBOX_AUTOCLOSE end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 - msgbox Route117_Text_1BDF37, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + msgbox Route117_Text_1BDF37, MSGBOX_AUTOCLOSE end |