OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA

This commit is contained in:
GriffinR
2024-10-12 23:34:02 -04:00
parent bf17d54b52
commit f61c0099b9
146 changed files with 627 additions and 623 deletions
+14 -14
View File
@@ -50,12 +50,12 @@ Route104_EventScript_RivalTrigger::
setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 10
addobject LOCALID_ROUTE104_RIVAL
clearflag FLAG_HIDE_ROUTE_104_RIVAL
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp
applymovement LOCALID_PLAYER, Route104_Movement_PlayerBackUp
waitmovement 0
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalExitBrineysCottage
waitmovement 0
@@ -103,7 +103,7 @@ Route104_EventScript_MayEncounter::
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement LOCALID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft
msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT
closemessage
@@ -189,7 +189,7 @@ Route104_EventScript_BrendanEncounter::
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement LOCALID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft
msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT
closemessage
@@ -344,13 +344,13 @@ Route104_EventScript_Girl2::
Route104_EventScript_SailToDewford::
setobjectsubpriority LOCALID_ROUTE104_BRINEY, MAP_ROUTE104, 0
setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0
setobjectsubpriority LOCALID_PLAYER, MAP_ROUTE104, 0
applymovement LOCALID_ROUTE104_BRINEY, Route104_Movement_BrineyBoardBoat
waitmovement 0
removeobject LOCALID_ROUTE104_BRINEY
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat
applymovement LOCALID_PLAYER, Route104_Movement_PlayerBoardBoat
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
hideobjectat LOCALID_PLAYER, MAP_ROUTE104
call Common_EventScript_PlayBrineysBoatMusic
goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall
goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls
@@ -358,13 +358,13 @@ Route104_EventScript_SailToDewford::
Route104_EventScript_SailToDewfordNoCall::
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewford
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford
applymovement LOCALID_PLAYER, Route104_Movement_SailToDewford
waitmovement 0
goto Route104_EventScript_ArriveInDewford
Route104_EventScript_SailToDewfordDadCalls::
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordBeforeDadCalls
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
applymovement LOCALID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
waitmovement 0
pokenavcall Route104_Text_DadPokenavCall
waitmessage
@@ -375,7 +375,7 @@ Route104_EventScript_SailToDewfordDadCalls::
closemessage
delay 30
setflag FLAG_ENABLE_NORMAN_MATCH_CALL
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
applymovement LOCALID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
waitmovement LOCALID_ROUTE104_BOAT, MAP_ROUTE104
waitmovement 0
@@ -383,11 +383,11 @@ Route104_EventScript_SailToDewfordDadCalls::
Route104_EventScript_ArriveInDewford::
delay 50
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerExitBoat
applymovement LOCALID_PLAYER, Route104_Movement_PlayerExitBoat
waitmovement 0
call Common_EventScript_StopBrineysBoatMusic
showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
showobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN
applymovement LOCALID_PLAYER, Route104_Movement_PlayerMoveForBriney
waitmovement 0
setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8
addobject LOCALID_DEWFORD_BRINEY
@@ -401,7 +401,7 @@ Route104_EventScript_ArriveInDewford::
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat LOCALID_ROUTE104_BOAT, MAP_ROUTE104
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
resetobjectsubpriority LOCALID_PLAYER, MAP_ROUTE104
resetobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN
copyobjectxytoperm LOCALID_DEWFORD_BRINEY
setvar VAR_BOARD_BRINEY_BOAT_STATE, 0