diff options
Diffstat (limited to 'data/maps/LavaridgeTown/scripts.inc')
| -rw-r--r-- | data/maps/LavaridgeTown/scripts.inc | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index d1facba32..47c5482a6 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_RIVAL_ON_BIKE, 7 +.set LOCALID_RIVAL, 8 + LavaridgeTown_MapScripts:: @ 81EA4D3 map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame @@ -26,9 +29,9 @@ LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518 return LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529 - setobjectxyperm 8, 11, 9 - setobjectxyperm 7, 9, 8 - setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP + setobjectxyperm LOCALID_RIVAL, 11, 9 + setobjectxyperm LOCALID_RIVAL_ON_BIKE, 9, 8 + setobjectmovementtype LOCALID_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL return @@ -86,14 +89,14 @@ LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF closemessage - removeobject 8 - addobject 7 + removeobject LOCALID_RIVAL + addobject LOCALID_RIVAL_ON_BIKE delay 30 compare VAR_0x8008, 9 call_if_eq LavaridgeTown_EventScript_RivalExit1 compare VAR_0x8008, 9 call_if_ne LavaridgeTown_EventScript_RivalExit2 - removeobject 7 + removeobject LOCALID_RIVAL_ON_BIKE setvar VAR_LAVARIDGE_TOWN_STATE, 2 clearflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_DUMMY @@ -110,52 +113,52 @@ LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635 return LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A - applymovement 8, Common_Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN - applymovement 8, Common_Movement_ExclamationMark + applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, Common_Movement_Delay48 + applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 return LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C opendoor 12, 15 waitdooranim - addobject 8 - applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop + addobject LOCALID_RIVAL + applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, Common_Movement_WalkInPlaceFastestLeft + applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN - applymovement 8, Common_Movement_ExclamationMark + applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, Common_Movement_Delay48 + applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1 - applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer1 + applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1 waitmovement 0 return LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC - applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2 + applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2 waitmovement 0 return LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7 applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit - applymovement 7, LavaridgeTown_Movement_RivalExit1 + applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9 - applymovement 7, LavaridgeTown_Movement_RivalExit2 + applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2 waitmovement 0 return |