Continue adding local IDs to map.json files

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

View File

@@ -1,6 +1,3 @@
.set LOCALID_RIVAL_ON_BIKE, 7
.set LOCALID_RIVAL, 8
LavaridgeTown_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame
@@ -26,9 +23,9 @@ LavaridgeTown_EventScript_CheckSetRivalPos::
return
LavaridgeTown_EventScript_SetRivalPos::
setobjectxyperm LOCALID_RIVAL, 11, 9
setobjectxyperm LOCALID_RIVAL_ON_BIKE, 9, 8
setobjectmovementtype LOCALID_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_LAVARIDGE_RIVAL, 11, 9
setobjectxyperm LOCALID_LAVARIDGE_RIVAL_ON_BIKE, 9, 8
setobjectmovementtype LOCALID_LAVARIDGE_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP
clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
return
@@ -78,12 +75,12 @@ LavaridgeTown_EventScript_BrendanGiveGoGoggles::
LavaridgeTown_EventScript_RivalExit::
closemessage
removeobject LOCALID_RIVAL
addobject LOCALID_RIVAL_ON_BIKE
removeobject LOCALID_LAVARIDGE_RIVAL
addobject LOCALID_LAVARIDGE_RIVAL_ON_BIKE
delay 30
call_if_eq VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit1
call_if_ne VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit2
removeobject LOCALID_RIVAL_ON_BIKE
removeobject LOCALID_LAVARIDGE_RIVAL_ON_BIKE
setvar VAR_LAVARIDGE_TOWN_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_DUMMY
@@ -100,52 +97,52 @@ LavaridgeTown_EventScript_PlayBrendanMusic::
return
LavaridgeTown_EventScript_RivalNoticePlayer::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48
waitmovement 0
return
LavaridgeTown_EventScript_RivalExitHerbShop::
opendoor 12, 15
waitdooranim
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop
addobject LOCALID_LAVARIDGE_RIVAL
applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop
waitmovement 0
closedoor 12, 15
waitdooranim
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
LavaridgeTown_EventScript_RivalApproachPlayer1::
applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1
applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1
waitmovement 0
return
LavaridgeTown_EventScript_RivalApproachPlayer2::
applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2
applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2
waitmovement 0
return
LavaridgeTown_EventScript_RivalExit1::
applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1
applymovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1
waitmovement 0
return
LavaridgeTown_EventScript_RivalExit2::
applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2
applymovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2
waitmovement 0
return