Continue adding local IDs to map.json files
This commit is contained in:
@@ -1,7 +1,3 @@
|
||||
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
|
||||
@ These are labeled in DewfordTown/scripts.inc
|
||||
.set LOCALID_RIVAL, 34
|
||||
|
||||
Route104_MapScripts::
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition
|
||||
@@ -36,7 +32,7 @@ Route104_EventScript_TrySetRivalPos::
|
||||
goto_if_ge VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_DontSetRivalPos
|
||||
goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos
|
||||
goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_DontSetRivalPos
|
||||
setobjectxyperm LOCALID_RIVAL, 17, 52
|
||||
setobjectxyperm LOCALID_ROUTE104_RIVAL, 17, 52
|
||||
return
|
||||
|
||||
Route104_EventScript_DontSetRivalPos::
|
||||
@@ -45,7 +41,7 @@ Route104_EventScript_DontSetRivalPos::
|
||||
Route104_EventScript_Rival::
|
||||
lockall
|
||||
setvar VAR_0x8008, 1
|
||||
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_FacePlayer
|
||||
waitmovement 0
|
||||
goto Route104_EventScript_RivalEncounter
|
||||
|
||||
@@ -57,19 +53,19 @@ Route104_EventScript_RivalTrigger::
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
|
||||
waitmovement 0
|
||||
delay 10
|
||||
addobject LOCALID_RIVAL
|
||||
addobject LOCALID_ROUTE104_RIVAL
|
||||
clearflag FLAG_HIDE_ROUTE_104_RIVAL
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp
|
||||
waitmovement 0
|
||||
applymovement LOCALID_RIVAL, Route104_Movement_RivalExitBrineysCottage
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalExitBrineysCottage
|
||||
waitmovement 0
|
||||
delay 20
|
||||
setvar VAR_0x8008, 0
|
||||
call RustboroCity_EventScript_PlayRivalMusic
|
||||
playse SE_PIN
|
||||
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_ExclamationMark
|
||||
waitmovement 0
|
||||
applymovement LOCALID_RIVAL, Common_Movement_Delay48
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
goto Route104_EventScript_RivalEncounter
|
||||
|
||||
@@ -108,13 +104,13 @@ Route104_EventScript_MayEncounter::
|
||||
delay 30
|
||||
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
|
||||
applymovement LOCALID_RIVAL, Route104_Movement_RivalWalkSlowLeft
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft
|
||||
msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
waitmovement 0
|
||||
applymovement LOCALID_RIVAL, Route104_Movement_RivalApproachPlayer
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer
|
||||
waitmovement 0
|
||||
copyobjectxytoperm LOCALID_RIVAL
|
||||
copyobjectxytoperm LOCALID_ROUTE104_RIVAL
|
||||
msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO
|
||||
goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleMay
|
||||
msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT
|
||||
@@ -194,13 +190,13 @@ Route104_EventScript_BrendanEncounter::
|
||||
delay 30
|
||||
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
|
||||
applymovement LOCALID_RIVAL, Route104_Movement_RivalWalkSlowLeft
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalWalkSlowLeft
|
||||
msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
waitmovement 0
|
||||
applymovement LOCALID_RIVAL, Route104_Movement_RivalApproachPlayer
|
||||
applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer
|
||||
waitmovement 0
|
||||
copyobjectxytoperm LOCALID_RIVAL
|
||||
copyobjectxytoperm LOCALID_ROUTE104_RIVAL
|
||||
msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO
|
||||
goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleBrendan
|
||||
msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT
|
||||
@@ -347,11 +343,11 @@ Route104_EventScript_Girl2::
|
||||
end
|
||||
|
||||
Route104_EventScript_SailToDewford::
|
||||
setobjectsubpriority LOCALID_BRINEY_R104, MAP_ROUTE104, 0
|
||||
setobjectsubpriority LOCALID_ROUTE104_BRINEY, MAP_ROUTE104, 0
|
||||
setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0
|
||||
applymovement LOCALID_BRINEY_R104, Route104_Movement_BrineyBoardBoat
|
||||
applymovement LOCALID_ROUTE104_BRINEY, Route104_Movement_BrineyBoardBoat
|
||||
waitmovement 0
|
||||
removeobject LOCALID_BRINEY_R104
|
||||
removeobject LOCALID_ROUTE104_BRINEY
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat
|
||||
waitmovement 0
|
||||
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
|
||||
@@ -361,13 +357,13 @@ Route104_EventScript_SailToDewford::
|
||||
end
|
||||
|
||||
Route104_EventScript_SailToDewfordNoCall::
|
||||
applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewford
|
||||
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewford
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford
|
||||
waitmovement 0
|
||||
goto Route104_EventScript_ArriveInDewford
|
||||
|
||||
Route104_EventScript_SailToDewfordDadCalls::
|
||||
applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewfordBeforeDadCalls
|
||||
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordBeforeDadCalls
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
|
||||
waitmovement 0
|
||||
pokenavcall Route104_Text_DadPokenavCall
|
||||
@@ -380,8 +376,8 @@ Route104_EventScript_SailToDewfordDadCalls::
|
||||
delay 30
|
||||
setflag FLAG_ENABLE_NORMAN_MATCH_CALL
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
|
||||
applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
|
||||
waitmovement LOCALID_BOAT_R104, MAP_ROUTE104
|
||||
applymovement LOCALID_ROUTE104_BOAT, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
|
||||
waitmovement LOCALID_ROUTE104_BOAT, MAP_ROUTE104
|
||||
waitmovement 0
|
||||
goto Route104_EventScript_ArriveInDewford
|
||||
|
||||
@@ -393,21 +389,21 @@ Route104_EventScript_ArriveInDewford::
|
||||
showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
|
||||
waitmovement 0
|
||||
setobjectxyperm LOCALID_BRINEY_DEWFORD, 12, 8
|
||||
addobject LOCALID_BRINEY_DEWFORD
|
||||
setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
|
||||
setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8
|
||||
addobject LOCALID_DEWFORD_BRINEY
|
||||
setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0
|
||||
clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
|
||||
applymovement LOCALID_BRINEY_DEWFORD, Route104_Movement_BrineyExitBoat
|
||||
applymovement LOCALID_DEWFORD_BRINEY, Route104_Movement_BrineyExitBoat
|
||||
waitmovement 0
|
||||
addobject LOCALID_BOAT_DEWFORD
|
||||
addobject LOCALID_DEWFORD_BOAT
|
||||
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
|
||||
call Common_EventScript_StopBrineysBoatMusic
|
||||
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
|
||||
hideobjectat LOCALID_BOAT_R104, MAP_ROUTE104
|
||||
hideobjectat LOCALID_ROUTE104_BOAT, MAP_ROUTE104
|
||||
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
|
||||
resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
|
||||
resetobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN
|
||||
copyobjectxytoperm LOCALID_BRINEY_DEWFORD
|
||||
resetobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN
|
||||
copyobjectxytoperm LOCALID_DEWFORD_BRINEY
|
||||
setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
|
||||
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder
|
||||
goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford
|
||||
|
||||
Reference in New Issue
Block a user