OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA

This commit is contained in:
GriffinR
2024-10-14 22:48:30 -04:00
parent a2e408cf4e
commit 4dc5c47799
75 changed files with 315 additions and 315 deletions
@@ -51,7 +51,7 @@ PalletTown_ProfessorOaksLab_OnWarp::
.2byte 0
PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PalletTown_ProfessorOaksLab_OnFrame::
@@ -69,7 +69,7 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene
end
@@ -131,7 +131,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -141,7 +141,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -156,12 +156,12 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -172,14 +172,14 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth::
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
return
@@ -213,7 +213,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -266,7 +266,7 @@ PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
waitmovement 0
releaseall
end
@@ -298,7 +298,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
@@ -490,19 +490,19 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
waitmovement LOCALID_RIVAL
return
@@ -703,7 +703,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth::
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
waitmovement 0
return
@@ -735,14 +735,14 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth::
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
return
@@ -958,7 +958,7 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -967,7 +967,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -992,7 +992,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1001,31 +1001,31 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth::
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
@@ -1036,7 +1036,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit::
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return