Add local object event ids for referenced objects

This commit is contained in:
GriffinR
2020-06-21 01:56:57 -04:00
parent 46f4a4bbf7
commit fac6288156
192 changed files with 2857 additions and 2205 deletions
@@ -1,3 +1,7 @@
.set LOCALID_MOM, 1
.set LOCALID_RIVAL_MOM, 4
.set LOCALID_RIVAL, 7
LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition
@@ -35,18 +39,18 @@ LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
end
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916
setobjectxyperm 1, 2, 4
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_MOM, 2, 4
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922
setobjectxyperm 1, 6, 5
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_MOM, 6, 5
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E
setobjectxyperm 1, 1, 8
setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_MOM, 1, 8
setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
return
@ Many of the below scripts have no gender check because they assume youre in the correct house
@@ -63,7 +67,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
applymovement LOCALID_MOM, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
waitmovement 0
warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
waitstate
@@ -76,27 +80,27 @@ LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A
LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C
lockall
setvar VAR_0x8004, 1
setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, FEMALE
goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
end
LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D
lockall
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
setvar VAR_0x8004, FEMALE
setvar VAR_0x8005, LOCALID_MOM
goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale
end
LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
lockall
playse SE_PIN
applymovement 4, Common_Movement_ExclamationMark
applymovement LOCALID_RIVAL_MOM, Common_Movement_ExclamationMark
waitmovement 0
applymovement 4, Common_Movement_Delay48
applymovement LOCALID_RIVAL_MOM, Common_Movement_Delay48
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach
applymovement LOCALID_RIVAL_MOM, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach
waitmovement 0
special GetRivalSonDaughterString
msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT
@@ -151,7 +155,7 @@ RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
lockall
setvar VAR_0x8004, 1
setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, FEMALE
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
@@ -179,12 +183,12 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F
LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
playse SE_KAIDAN
delay 10
addobject 7
addobject LOCALID_RIVAL
delay 30
playse SE_PIN
applymovement 7, Common_Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement 7, Common_Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
compare VAR_0x8008, 1
call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay
@@ -204,7 +208,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
compare VAR_0x8008, 2
call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2
playse SE_KAIDAN
removeobject 7
removeobject LOCALID_RIVAL
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
@@ -222,17 +226,17 @@ LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2
waitmovement 0
return
@@ -264,19 +268,19 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
waitmovement 0
return