diff options
Diffstat (limited to 'data/maps/Route103/scripts.inc')
| -rw-r--r-- | data/maps/Route103/scripts.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76d..f711416fd 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,10 +1,10 @@ Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -140,10 +140,10 @@ Route103_EventScript_1EC585:: @ 81EC585 Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 - setvar VAR_0x4084, 4 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar VAR_0x40C7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY fadedefaultbgm |