diff options
Diffstat (limited to 'data/maps/Route101/scripts.inc')
| -rw-r--r-- | data/maps/Route101/scripts.inc | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index c7f570044..60e67565d 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,10 +1,10 @@ Route101_MapScripts:: @ 814E924 - map_script 3, Route101_MapScript1_14E92F - map_script 2, Route101_MapScript2_14E935 + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_14E92F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_14E935 .byte 0 Route101_MapScript1_14E92F:: @ 814E92F - call Route101_EventScript_1A02F4 + call ProfBirch_EventScript_UpdateLocation end Route101_MapScript2_14E935:: @ 814E935 @@ -19,23 +19,23 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall playbgm MUS_EVENT0, TRUE - msgbox Route101_Text_16D10E, 4 + msgbox Route101_Text_16D10E, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement 255, Route101_Movement_14EA2C + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F waitmovement 0 applymovement 4, Route101_Movement_14EA00 applymovement 2, Route101_Movement_14EA31 waitmovement 0 - applymovement 2, Route101_Movement_1A0843 + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, Route101_Movement_14EA27 applymovement 2, Route101_Movement_14EA58 waitmovement 0 - msgbox Route101_Text_16D119, 4 + msgbox Route101_Text_16D119, MSGBOX_DEFAULT closemessage setvar VAR_ROUTE101_STATE, 2 releaseall @@ -43,42 +43,42 @@ Route101_EventScript_14E948:: @ 814E948 Route101_EventScript_14E9B8:: @ 814E9B8 lockall - msgbox Route101_Text_16D15E, 4 + msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FA + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FA waitmovement 0 releaseall end Route101_EventScript_14E9CE:: @ 814E9CE lockall - msgbox Route101_Text_16D15E, 4 + msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FC + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FC waitmovement 0 releaseall end Route101_EventScript_14E9E4:: @ 814E9E4 lockall - msgbox Route101_Text_16D15E, 4 + msgbox Route101_Text_16D15E, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_14E9FE + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FE waitmovement 0 releaseall end Route101_Movement_14E9FA:: @ 814E9FA walk_up - end_movement + step_end Route101_Movement_14E9FC:: @ 814E9FC walk_right - end_movement + step_end Route101_Movement_14E9FE:: @ 814E9FE walk_down - end_movement + step_end Route101_Movement_14EA00:: @ 814EA00 walk_fast_up @@ -111,7 +111,7 @@ Route101_Movement_14EA00:: @ 814EA00 walk_fast_down walk_fast_left walk_fast_left - end_movement + step_end Route101_Movement_14EA1F:: @ 814EA1F walk_fast_up @@ -120,24 +120,24 @@ Route101_Movement_14EA1F:: @ 814EA1F walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end @ 814EA26 - end_movement + step_end Route101_Movement_14EA27:: @ 814EA27 walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left - end_movement + step_end Route101_Movement_14EA2C:: @ 814EA2C walk_fast_up walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route101_Movement_14EA31:: @ 814EA31 walk_fast_up @@ -170,7 +170,7 @@ Route101_Movement_14EA31:: @ 814EA31 walk_fast_left walk_fast_left walk_fast_left - end_movement + step_end Route101_Movement_14EA50:: @ 814EA50 walk_fast_right @@ -179,39 +179,39 @@ Route101_Movement_14EA50:: @ 814EA50 walk_fast_right walk_fast_up walk_fast_up - end_movement + step_end @ 814EA57 - end_movement + step_end Route101_Movement_14EA58:: @ 814EA58 walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right - end_movement + step_end @ 814EA5D walk_up walk_up - end_movement + step_end @ 814EA60 walk_up walk_left walk_up - end_movement + step_end Route101_EventScript_14EA64:: @ 814EA64 - msgbox Route101_Text_16D25E, 2 + msgbox Route101_Text_16D25E, MSGBOX_NPC end Route101_EventScript_14EA6D:: @ 814EA6D - msgbox Route101_Text_16D2CB, 2 + msgbox Route101_Text_16D2CB, MSGBOX_NPC end Route101_EventScript_14EA76:: @ 814EA76 - msgbox Route101_Text_16D349, 3 + msgbox Route101_Text_16D349, MSGBOX_SIGN end Route101_EventScript_14EA7F:: @ 814EA7F @@ -219,16 +219,16 @@ Route101_EventScript_14EA7F:: @ 814EA7F faceplayer setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 4 - setobjectxy 255, 6, 13 - applymovement 255, Route101_Movement_1A083F + setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ScrSpecial_ChooseStarter waitstate applymovement 2, Route101_Movement_14EAD7 waitmovement 0 - msgbox Route101_Text_16D191, 4 + msgbox Route101_Text_16D191, MSGBOX_DEFAULT special ScrSpecial_HealPlayerParty setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB @@ -243,4 +243,4 @@ Route101_EventScript_14EA7F:: @ 814EA7F Route101_Movement_14EAD7:: @ 814EAD7 walk_right - end_movement + step_end |