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
+49 -43
View File
@@ -1,3 +1,9 @@
.set LOCALID_WALLY, 2
.set LOCALID_BOY, 3
.set LOCALID_WALLYS_UNCLE, 5
.set LOCALID_GYM_BOY, 8
.set LOCALID_SCOTT, 9
PetalburgCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame
@@ -6,7 +12,7 @@ PetalburgCity_MapScripts::
PetalburgCity_OnTransition: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_PETALBURG_CITY_STATE, 0
call_if_eq PetalburgCity_EventScript_MoveBoyToWestEntrance
call_if_eq PetalburgCity_EventScript_MoveGymBoyToWestEntrance
compare VAR_PETALBURG_CITY_STATE, 2
call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic
compare VAR_PETALBURG_CITY_STATE, 4
@@ -15,8 +21,8 @@ PetalburgCity_OnTransition: @ 81DC2D7
call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked
end
PetalburgCity_EventScript_MoveBoyToWestEntrance:: @ 81DC307
setobjectxyperm 8, 5, 11
PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307
setobjectxyperm LOCALID_GYM_BOY, 5, 11
return
PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F
@@ -37,15 +43,15 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
lockall
special SavePlayerParty
special PutZigzagoonInPlayerParty
applymovement 2, PetalburgCity_Movement_WallyTutorialWally
applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer
waitmovement 0
msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT
special StartWallyTutorialBattle
waitstate
msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT
applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
waitmovement 2, MAP_PETALBURG_CITY
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY
msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT
closemessage
clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -62,14 +68,14 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
lockall
setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkToWallyHouseUncle
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
waitmovement 0
setvar VAR_0x8004, 7
setvar VAR_0x8005, 5
opendoor VAR_0x8004, VAR_0x8005
waitdooranim
applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkInsideHouseUncle
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
waitmovement 0
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
@@ -84,12 +90,12 @@ PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
releaseall
end
PetalburgCity_EventScript_Boy1:: @ 81DC3E6
PetalburgCity_EventScript_Boy:: @ 81DC3E6
lock
faceplayer
msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT
closemessage
applymovement 3, Common_Movement_FaceOriginalDirection
applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -263,13 +269,13 @@ PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE
end
PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
applymovement 8, Common_Movement_FacePlayer
applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer
waitmovement 0
playbgm MUS_TSURETEK, 0
playse SE_PIN
applymovement 8, Common_Movement_ExclamationMark
applymovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark
waitmovement 0
applymovement 8, Common_Movement_Delay48
applymovement LOCALID_GYM_BOY, Common_Movement_Delay48
waitmovement 0
compare VAR_0x8008, 0
call_if_eq PetalburgCity_EventScript_BoyApproachPlayer0
@@ -290,63 +296,63 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
compare VAR_0x8008, 3
call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3
msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT
applymovement 8, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_GYM_BOY, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT
closemessage
applymovement 8, PetalburgCity_Movement_BoyWalkAway
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkAway
waitmovement 0
fadedefaultbgm
releaseall
end
PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F
applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594
applymovement 8, PetalburgCity_Movement_BoyApproachPlayer1
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer1
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F
applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4
applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9
applymovement 8, PetalburgCity_Movement_BoyWalkToGym0
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym0
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB
applymovement 8, PetalburgCity_Movement_BoyWalkToGym1
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym1
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED
applymovement 8, PetalburgCity_Movement_BoyWalkToGym2
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym2
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2
waitmovement 0
return
PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
applymovement 8, PetalburgCity_Movement_BoyWalkToGym3
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym3
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3
waitmovement 0
return
@@ -510,57 +516,57 @@ PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
PetalburgCity_EventScript_Scott0:: @ 81DC691
lockall
addobject 9
addobject LOCALID_SCOTT
setvar VAR_0x8008, 0
setobjectxy 9, 13, 10
setobjectxy LOCALID_SCOTT, 13, 10
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott1:: @ 81DC6A7
lockall
addobject 9
addobject LOCALID_SCOTT
setvar VAR_0x8008, 1
setobjectxy 9, 13, 11
setobjectxy LOCALID_SCOTT, 13, 11
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott2:: @ 81DC6BD
lockall
addobject 9
addobject LOCALID_SCOTT
setvar VAR_0x8008, 2
setobjectxy 9, 13, 12
setobjectxy LOCALID_SCOTT, 13, 12
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott3:: @ 81DC6D3
lockall
addobject 9
addobject LOCALID_SCOTT
setvar VAR_0x8008, 3
setobjectxy 9, 13, 13
setobjectxy LOCALID_SCOTT, 13, 13
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott:: @ 81DC6E9
applymovement 9, PetalburgCity_Movement_ScottStartWalkLeft
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft
waitmovement 0
playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark
applymovement LOCALID_SCOTT, Common_Movement_ExclamationMark
waitmovement 0
applymovement 9, Common_Movement_Delay48
applymovement LOCALID_SCOTT, Common_Movement_Delay48
waitmovement 0
applymovement 9, PetalburgCity_Movement_ScottApproachPlayer
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT
closemessage
applymovement 9, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT
closemessage
applymovement 9, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 30
msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT
@@ -574,31 +580,31 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9
compare VAR_0x8008, 3
call_if_eq PetalburgCity_EventScript_ScottExit3
setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1
removeobject 9
removeobject LOCALID_SCOTT
releaseall
end
PetalburgCity_EventScript_ScottExit0:: @ 81DC78E
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0
applymovement 9, PetalburgCity_Movement_ScottExit0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit0
waitmovement 0
return
PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1
applymovement 9, PetalburgCity_Movement_ScottExit1
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit1
waitmovement 0
return
PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2
applymovement 9, PetalburgCity_Movement_ScottExit2
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit2
waitmovement 0
return
PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3
applymovement 9, PetalburgCity_Movement_ScottExit3
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit3
waitmovement 0
return
@@ -710,7 +716,7 @@ PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
walk_in_place_fastest_left
step_end
PetalburgCity_EventScript_Boy2:: @ 81DC82E
PetalburgCity_EventScript_GymBoy:: @ 81DC82E
msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC
end