diff options
Diffstat (limited to 'data/maps/Route116/scripts.inc')
| -rw-r--r-- | data/maps/Route116/scripts.inc | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 29ddd8ae2..3bd2091f7 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,5 +1,5 @@ Route116_MapScripts:: @ 8150A31 - map_script 3, Route116_MapScript1_150A37 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_150A37 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 @@ -15,17 +15,17 @@ Route116_EventScript_150A49:: @ 8150A49 faceplayer goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67 goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71 - msgbox Route116_Text_1703CF, 4 + msgbox Route116_Text_1703CF, MSGBOX_DEFAULT release end Route116_EventScript_150A67:: @ 8150A67 - msgbox Route116_Text_170556, 4 + msgbox Route116_Text_170556, MSGBOX_DEFAULT release end Route116_EventScript_150A71:: @ 8150A71 - msgbox Route116_Text_1703F7, 4 + msgbox Route116_Text_1703F7, MSGBOX_DEFAULT release end @@ -33,16 +33,16 @@ Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04 - msgbox Route116_Text_1705AE, 4 + msgbox Route116_Text_1705AE, MSGBOX_DEFAULT goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE - giveitem_std ITEM_REPEAT_BALL + giveitem ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_150B12 - msgbox Route116_Text_1707B8, 4 + msgbox Route116_Text_1707B8, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if_eq Route116_EventScript_150AEE @@ -69,12 +69,12 @@ Route116_EventScript_150AF9:: @ 8150AF9 return Route116_EventScript_150B04:: @ 8150B04 - msgbox Route116_Text_170865, 4 + msgbox Route116_Text_170865, MSGBOX_DEFAULT goto Route116_EventScript_150A94 end Route116_EventScript_150B12:: @ 8150B12 - msgbox Route116_Text_17082A, 4 + msgbox Route116_Text_17082A, MSGBOX_DEFAULT release end @@ -87,7 +87,7 @@ Route116_Movement_150B1C:: @ 8150B1C walk_left walk_left walk_left - end_movement + step_end Route116_Movement_150B25:: @ 8150B25 walk_down @@ -100,42 +100,42 @@ Route116_Movement_150B25:: @ 8150B25 walk_left walk_left walk_left - end_movement + step_end Route116_EventScript_150B30:: @ 8150B30 - msgbox Route116_Text_170A46, 3 + msgbox Route116_Text_170A46, MSGBOX_SIGN end Route116_EventScript_150B39:: @ 8150B39 - msgbox Route116_Text_170A60, 3 + msgbox Route116_Text_170A60, MSGBOX_SIGN end Route116_EventScript_150B42:: @ 8150B42 - msgbox Route116_Text_170AB8, 3 + msgbox Route116_Text_170AB8, MSGBOX_SIGN end Route116_EventScript_150B4B:: @ 8150B4B - msgbox Route116_Text_170ACE, 3 + msgbox Route116_Text_170ACE, MSGBOX_SIGN end Route116_EventScript_150B54:: @ 8150B54 - msgbox Route116_Text_170B7D, 3 + msgbox Route116_Text_170B7D, MSGBOX_SIGN end Route116_EventScript_150B5D:: @ 8150B5D lock faceplayer - msgbox Route116_Text_17032A, 4 + msgbox Route116_Text_17032A, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 release end Route116_EventScript_150B6E:: @ 8150B6E lockall - applymovement 11, Route116_Movement_1A0843 - applymovement 255, Route116_Movement_1A083F + applymovement 11, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox Route116_Text_17032A, 4 + msgbox Route116_Text_17032A, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 releaseall end @@ -149,28 +149,28 @@ Route116_EventScript_150B8F:: @ 8150B8F specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150BBB - msgbox Route116_Text_1708EE, 4 + msgbox Route116_Text_1708EE, MSGBOX_DEFAULT release end Route116_EventScript_150BBB:: @ 8150BBB - msgbox Route116_Text_1709B7, 4 + msgbox Route116_Text_1709B7, MSGBOX_DEFAULT closemessage goto Route116_EventScript_150C03 end Route116_EventScript_150BCA:: @ 8150BCA - msgbox Route116_Text_1708EE, 4 - msgbox Route116_Text_170921, 4 + msgbox Route116_Text_1708EE, MSGBOX_DEFAULT + msgbox Route116_Text_170921, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150BF4 - msgbox Route116_Text_170A03, 4 + msgbox Route116_Text_170A03, MSGBOX_DEFAULT release end Route116_EventScript_150BF4:: @ 8150BF4 - msgbox Route116_Text_17094D, 4 + msgbox Route116_Text_17094D, MSGBOX_DEFAULT closemessage goto Route116_EventScript_150C03 end @@ -209,7 +209,7 @@ Route116_Movement_150C4D:: @ 8150C4D walk_left walk_left walk_left - end_movement + step_end Route116_Movement_150C57:: @ 8150C57 walk_up @@ -222,50 +222,50 @@ Route116_Movement_150C57:: @ 8150C57 walk_left walk_left walk_left - end_movement + step_end Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C - msgbox Route116_Text_1BD078, 6 + trainerbattle_single TRAINER_JOEY, Route116_Text_1BD02B, Route116_Text_1BD04C + msgbox Route116_Text_1BD078, MSGBOX_AUTOCLOSE end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 - msgbox Route116_Text_1BD0F4, 6 + trainerbattle_single TRAINER_JOSE, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + msgbox Route116_Text_1BD0F4, MSGBOX_AUTOCLOSE end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle_single TRAINER_JERRY_1, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150CB7 - msgbox Route116_Text_1BD248, 6 + msgbox Route116_Text_1BD248, MSGBOX_AUTOCLOSE end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE - msgbox Route116_Text_1BD31A, 6 + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_1BD2A5, Route116_Text_1BD2FE + msgbox Route116_Text_1BD31A, MSGBOX_AUTOCLOSE end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB - msgbox Route116_Text_1BCFE3, 6 + trainerbattle_single TRAINER_CLARK, Route116_Text_1BCF79, Route116_Text_1BCFBB + msgbox Route116_Text_1BCFE3, MSGBOX_AUTOCLOSE end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 - msgbox Route116_Text_1BD180, 6 + trainerbattle_single TRAINER_JANICE, Route116_Text_1BD131, Route116_Text_1BD165 + msgbox Route116_Text_1BD180, MSGBOX_AUTOCLOSE end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle_single TRAINER_KAREN_1, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150D23 - msgbox Route116_Text_1BD3C3, 6 + msgbox Route116_Text_1BD3C3, MSGBOX_AUTOCLOSE end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A - msgbox Route116_Text_1BD466, 6 + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_1BD405, Route116_Text_1BD44A + msgbox Route116_Text_1BD466, MSGBOX_AUTOCLOSE end |