diff options
Diffstat (limited to 'data/maps/Route119/scripts.inc')
| -rw-r--r-- | data/maps/Route119/scripts.inc | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index c94ce00e2..3b4e9c51f 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 8151167 - map_script 5, Route119_MapScript1_151172 - map_script 3, Route119_MapScript1_15119B + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_151172 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_15119B .byte 0 Route119_MapScript1_151172:: @ 8151172 @@ -23,9 +23,9 @@ Route119_EventScript_151197:: @ 8151197 return Route119_MapScript1_15119B:: @ 815119B - call Route119_EventScript_1A014E - call Route119_EventScript_1A0172 - call Route119_EventScript_1A0196 + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1511B9 special SetRoute119Weather @@ -60,7 +60,7 @@ Route119_EventScript_1511DB:: @ 81511DB call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1513B1 - applymovement 255, Route119_Movement_1A0845 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -87,7 +87,7 @@ Route119_EventScript_151259:: @ 8151259 return Route119_EventScript_15125E:: @ 815125E - msgbox Route119_Text_1710BB, 4 + msgbox Route119_Text_1710BB, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_15128D case 1, Route119_EventScript_15129D @@ -95,29 +95,29 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512BD:: @ 81512BD - msgbox Route119_Text_1711B1, 4 + msgbox Route119_Text_1711B1, MSGBOX_DEFAULT call Route119_EventScript_151352 - msgbox Route119_Text_171214, 4 + msgbox Route119_Text_171214, MSGBOX_DEFAULT goto Route119_EventScript_151362 end Route119_EventScript_1512D8:: @ 81512D8 - msgbox Route119_Text_171358, 4 + msgbox Route119_Text_171358, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_151307 case 1, Route119_EventScript_151317 @@ -125,29 +125,29 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151337:: @ 8151337 - msgbox Route119_Text_17140B, 4 + msgbox Route119_Text_17140B, MSGBOX_DEFAULT call Route119_EventScript_151352 - msgbox Route119_Text_171475, 4 + msgbox Route119_Text_171475, MSGBOX_DEFAULT goto Route119_EventScript_151362 end Route119_EventScript_151352:: @ 8151352 - giveitem_std ITEM_HM02_FLY + giveitem ITEM_HM02_FLY setflag FLAG_RECEIVED_HM02 return @@ -211,7 +211,7 @@ Route119_Movement_1513F0:: @ 81513F0 walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end Route119_Movement_1513FA:: @ 81513FA walk_fast_right @@ -224,7 +224,7 @@ Route119_Movement_1513FA:: @ 81513FA walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end Route119_Movement_151405:: @ 8151405 walk_fast_right @@ -236,7 +236,7 @@ Route119_Movement_151405:: @ 8151405 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route119_Movement_15140F:: @ 815140F walk_fast_left @@ -249,112 +249,112 @@ Route119_Movement_15140F:: @ 815140F walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route119_EventScript_15141A:: @ 815141A - msgbox Route119_Text_171698, 2 + msgbox Route119_Text_171698, MSGBOX_NPC end Route119_EventScript_151423:: @ 8151423 - msgbox Route119_Text_171749, 3 + msgbox Route119_Text_171749, MSGBOX_SIGN end Route119_EventScript_15142C:: @ 815142C - msgbox Route119_Text_171762, 3 + msgbox Route119_Text_171762, MSGBOX_SIGN end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F - msgbox Route119_Text_1BE561, 6 + trainerbattle_single TRAINER_BRENT, Route119_Text_1BE521, Route119_Text_1BE54F + msgbox Route119_Text_1BE561, MSGBOX_AUTOCLOSE end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF - msgbox Route119_Text_1BE5F8, 6 + trainerbattle_single TRAINER_DONALD, Route119_Text_1BE5A4, Route119_Text_1BE5DF + msgbox Route119_Text_1BE5F8, MSGBOX_AUTOCLOSE end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B - msgbox Route119_Text_1BE695, 6 + trainerbattle_single TRAINER_TAYLOR, Route119_Text_1BE632, Route119_Text_1BE67B + msgbox Route119_Text_1BE695, MSGBOX_AUTOCLOSE end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 - msgbox Route119_Text_1BE748, 6 + trainerbattle_single TRAINER_DOUG, Route119_Text_1BE6EA, Route119_Text_1BE729 + msgbox Route119_Text_1BE748, MSGBOX_AUTOCLOSE end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 - msgbox Route119_Text_1BE7E9, 6 + trainerbattle_single TRAINER_GREG, Route119_Text_1BE784, Route119_Text_1BE7D3 + msgbox Route119_Text_1BE7E9, MSGBOX_AUTOCLOSE end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D - msgbox Route119_Text_1BE89A, 6 + trainerbattle_single TRAINER_KENT, Route119_Text_1BE82F, Route119_Text_1BE88D + msgbox Route119_Text_1BE89A, MSGBOX_AUTOCLOSE end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_1514E6 - msgbox Route119_Text_1BE937, 6 + msgbox Route119_Text_1BE937, MSGBOX_AUTOCLOSE end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 - msgbox Route119_Text_1BE9E8, 6 + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_1BE98D, Route119_Text_1BE9D0 + msgbox Route119_Text_1BE9E8, MSGBOX_AUTOCLOSE end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_151524 - msgbox Route119_Text_1BEAB3, 6 + msgbox Route119_Text_1BEAB3, MSGBOX_AUTOCLOSE end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 - msgbox Route119_Text_1BEB68, 6 + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_1BEB22, Route119_Text_1BEB49 + msgbox Route119_Text_1BEB68, MSGBOX_AUTOCLOSE end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C - msgbox Route119_Text_1BEC2A, 6 + trainerbattle_single TRAINER_HUGH, Route119_Text_1BEBC0, Route119_Text_1BEC1C + msgbox Route119_Text_1BEC2A, MSGBOX_AUTOCLOSE end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A - msgbox Route119_Text_1BECB1, 6 + trainerbattle_single TRAINER_PHIL, Route119_Text_1BEC5E, Route119_Text_1BEC9A + msgbox Route119_Text_1BECB1, MSGBOX_AUTOCLOSE end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C - msgbox Route119_Text_1BED5C, 6 + trainerbattle_single TRAINER_YASU, Route119_Text_1BECF1, Route119_Text_1BED4C + msgbox Route119_Text_1BED5C, MSGBOX_AUTOCLOSE end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC - msgbox Route119_Text_1BEE06, 6 + trainerbattle_single TRAINER_TAKASHI, Route119_Text_1BEDB6, Route119_Text_1BEDEC + msgbox Route119_Text_1BEE06, MSGBOX_AUTOCLOSE end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B - msgbox Route119_Text_1BEE66, 6 + trainerbattle_single TRAINER_HIDEO_2, Route119_Text_1BEE2D, Route119_Text_1BEE4B + msgbox Route119_Text_1BEE66, MSGBOX_AUTOCLOSE end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 - msgbox Route119_Text_1BEF67, 6 + trainerbattle_single TRAINER_EUGENE, Route119_Text_1BEED0, Route119_Text_1BEF37 + msgbox Route119_Text_1BEF67, MSGBOX_AUTOCLOSE end Route119_EventScript_1515C5:: @ 81515C5 lock faceplayer - msgbox Route119_Text_171520, 4 + msgbox Route119_Text_171520, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -362,21 +362,21 @@ Route119_EventScript_1515C5:: @ 81515C5 Route119_EventScript_1515DC:: @ 81515DC lock faceplayer - msgbox Route119_Text_17157C, 4 + msgbox Route119_Text_17157C, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end Route119_EventScript_1515F3:: @ 81515F3 - msgbox Route119_Text_1715D7, 2 + msgbox Route119_Text_1715D7, MSGBOX_NPC end Route119_EventScript_1515FC:: @ 81515FC - msgbox Route119_Text_1716F4, 2 + msgbox Route119_Text_1716F4, MSGBOX_NPC end Route119_EventScript_151605:: @ 8151605 - msgbox Route119_Text_171774, 3 + msgbox Route119_Text_171774, MSGBOX_SIGN end |