dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding local IDs to map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
data/maps/RustboroCity/scripts.inc
View File

@@ -1,10 +1,3 @@
.set LOCALID_LITTLE_BOY, 7
.set LOCALID_LITTLE_GIRL, 8
.set LOCALID_DEVON_EMPLOYEE, 9
.set LOCALID_GRUNT, 10
.set LOCALID_RIVAL, 14
.set LOCALID_SCIENTIST, 15
RustboroCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame
@@ -20,11 +13,11 @@ RustboroCity_OnTransition:
RustboroCity_EventScript_PositionScientistForExit::
goto_if_eq VAR_TEMP_0, 11, RustboroCity_EventScript_PositionScientistLeftExit
setobjectxyperm LOCALID_SCIENTIST, 12, 15
setobjectxyperm LOCALID_RUSTBORO_SCIENTIST, 12, 15
end
RustboroCity_EventScript_PositionScientistLeftExit::
setobjectxyperm LOCALID_SCIENTIST, 11, 15
setobjectxyperm LOCALID_RUSTBORO_SCIENTIST, 11, 15
end
RustboroCity_EventScript_HideMapNamePopup::
@@ -42,22 +35,22 @@ RustboroCity_EventScript_ScientistAddMatchCall::
waitmovement 0
playse SE_EXIT
delay 10
addobject LOCALID_SCIENTIST
applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer
addobject LOCALID_RUSTBORO_SCIENTIST
applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_SCIENTIST, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SCIENTIST, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown
applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown
waitmovement 0
msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT
closemessage
setflag FLAG_HAS_MATCH_CALL
applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
playse SE_CLICK
delay 10
@@ -67,7 +60,7 @@ RustboroCity_EventScript_ScientistAddMatchCall::
delay 10
playse SE_CLICK
delay 20
applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT
closemessage
@@ -98,10 +91,10 @@ RustboroCity_EventScript_MatchCallTutorial::
delay 20
msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistLeave
applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistLeave
waitmovement 0
playse SE_EXIT
removeobject LOCALID_SCIENTIST
removeobject LOCALID_RUSTBORO_SCIENTIST
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_RUSTBORO_CITY_STATE, 7
clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -227,7 +220,7 @@ RustboroCity_EventScript_LittleBoy::
lock
faceplayer
msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT
applymovement LOCALID_LITTLE_BOY, Common_Movement_FaceOriginalDirection
applymovement LOCALID_RUSTBORO_LITTLE_BOY, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -236,7 +229,7 @@ RustboroCity_EventScript_LittleGirl::
lock
faceplayer
msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT
applymovement LOCALID_LITTLE_GIRL, Common_Movement_FaceOriginalDirection
applymovement LOCALID_RUSTBORO_LITTLE_GIRL, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -250,40 +243,40 @@ RustboroCity_EventScript_Man2::
RustboroCity_EventScript_StolenGoodsTrigger0::
lockall
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 0
goto RustboroCity_EventScript_StolenGoodsScene
end
RustboroCity_EventScript_StolenGoodsTrigger1::
lockall
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 1
goto RustboroCity_EventScript_StolenGoodsScene
end
RustboroCity_EventScript_StolenGoodsTrigger2::
lockall
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 2
goto RustboroCity_EventScript_StolenGoodsScene
end
RustboroCity_EventScript_StolenGoodsTrigger3::
lockall
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 3
goto RustboroCity_EventScript_StolenGoodsScene
end
RustboroCity_EventScript_StolenGoodsTrigger4::
lockall
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 14, 21
setobjectmovementtype LOCALID_RUSTBORO_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 4
goto RustboroCity_EventScript_StolenGoodsScene
end
@@ -292,20 +285,20 @@ RustboroCity_EventScript_StolenGoodsScene::
msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT
closemessage
playbgm MUS_ENCOUNTER_AQUA, FALSE
addobject LOCALID_GRUNT
addobject LOCALID_DEVON_EMPLOYEE
applymovement LOCALID_GRUNT, RustboroCity_Movement_GruntEscape
addobject LOCALID_RUSTBORO_GRUNT
addobject LOCALID_RUSTBORO_DEVON_EMPLOYEE
applymovement LOCALID_RUSTBORO_GRUNT, RustboroCity_Movement_GruntEscape
waitmovement 0
removeobject LOCALID_GRUNT
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1
removeobject LOCALID_RUSTBORO_GRUNT
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1
waitmovement 0
msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2
waitmovement 0
fadedefaultbgm
removeobject LOCALID_DEVON_EMPLOYEE
setobjectxyperm LOCALID_DEVON_EMPLOYEE, 30, 10
removeobject LOCALID_RUSTBORO_DEVON_EMPLOYEE
setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 30, 10
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_DEVON_GOODS_STOLEN
setvar VAR_RUSTBORO_CITY_STATE, 2
@@ -331,31 +324,31 @@ RustboroCity_EventScript_YouGotItThankYou::
@ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions
RustboroCity_EventScript_EmployeeApproachUp::
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp
waitmovement 0
return
@ Unused, see above
RustboroCity_EventScript_EmployeeApproachLeft::
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft
waitmovement 0
return
@ Unused, see above
RustboroCity_EventScript_EmployeeApproachRight::
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight
waitmovement 0
return
@ Unused, see above
RustboroCity_EventScript_EmployeeApproachDown::
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown
waitmovement 0
return
@ Unused, similar movement to the above scripts
RustboroCity_EventScript_EmployeeApproachPlayerFar::
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -509,57 +502,57 @@ RustboroCity_EventScript_EmployeeAskToGetGoods::
call_if_eq VAR_TEMP_1, 3, RustboroCity_EventScript_EmployeeApproachPlayerDown1
setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
setvar VAR_RUSTBORO_CITY_STATE, 3
copyobjectxytoperm LOCALID_DEVON_EMPLOYEE
copyobjectxytoperm LOCALID_RUSTBORO_DEVON_EMPLOYEE
msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT
releaseall
end
@ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods
RustboroCity_EventScript_EmployeeFacePlayerUp1::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
RustboroCity_EventScript_EmployeeFacePlayerLeft1::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceRight
waitmovement 0
return
RustboroCity_EventScript_EmployeeFacePlayerDown1::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
RustboroCity_EventScript_EmployeeApproachPlayerDown1::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -618,69 +611,69 @@ RustboroCity_EventScript_BagFull::
return
RustboroCity_EventScript_EmployeeFacePlayerUp2::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
RustboroCity_EventScript_EmployeeFacePlayerLeft2::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceLeft
waitmovement 0
return
RustboroCity_EventScript_EmployeeFacePlayerDown2::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
RustboroCity_EventScript_EmployeeApproachPlayerDown2::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
RustboroCity_EventScript_EmployeeFacePlayerRight::
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
playse SE_PIN
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48
waitmovement 0
return
RustboroCity_EventScript_Rival::
lockall
call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_FacePlayer
waitmovement 0
goto RustboroCity_EventScript_RivalEncounter
@@ -701,14 +694,14 @@ RustboroCity_EventScript_PlayBrendanMusic::
RustboroCity_EventScript_RivalTrigger0::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer0
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer0
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -717,14 +710,14 @@ RustboroCity_EventScript_RivalTrigger0::
RustboroCity_EventScript_RivalTrigger1::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer1
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer1
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -733,14 +726,14 @@ RustboroCity_EventScript_RivalTrigger1::
RustboroCity_EventScript_RivalTrigger2::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer2
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -749,14 +742,14 @@ RustboroCity_EventScript_RivalTrigger2::
RustboroCity_EventScript_RivalTrigger3::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer3
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer3
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -765,14 +758,14 @@ RustboroCity_EventScript_RivalTrigger3::
RustboroCity_EventScript_RivalTrigger4::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer4
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer4
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -781,14 +774,14 @@ RustboroCity_EventScript_RivalTrigger4::
RustboroCity_EventScript_RivalTrigger5::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer5
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer5
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -797,14 +790,14 @@ RustboroCity_EventScript_RivalTrigger5::
RustboroCity_EventScript_RivalTrigger6::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer6
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer6
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -813,14 +806,14 @@ RustboroCity_EventScript_RivalTrigger6::
RustboroCity_EventScript_RivalTrigger7::
lockall
call RustboroCity_EventScript_PlayRivalMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_RIVAL, RustboroCity_Movement_RivalApproachPlayer7
applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer7
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0