Add local object event ids for referenced objects
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
.set LOCALID_WALLACE, 1
|
||||
.set LOCALID_RIVAL, 2
|
||||
.set LOCALID_BIRCH, 3
|
||||
|
||||
EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
|
||||
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
|
||||
@@ -57,7 +61,7 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
|
||||
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
|
||||
compare VAR_RESULT, FEMALE
|
||||
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
|
||||
addobject 2
|
||||
addobject LOCALID_RIVAL
|
||||
call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer
|
||||
checkplayergender
|
||||
compare VAR_RESULT, MALE
|
||||
@@ -78,9 +82,9 @@ EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT
|
||||
delay 40
|
||||
playse SE_PIN
|
||||
applymovement 2, Common_Movement_ExclamationMark
|
||||
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
|
||||
waitmovement 0
|
||||
applymovement 2, Common_Movement_Delay48
|
||||
applymovement LOCALID_RIVAL, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT
|
||||
@@ -91,9 +95,9 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT
|
||||
delay 40
|
||||
playse SE_PIN
|
||||
applymovement 2, Common_Movement_ExclamationMark
|
||||
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
|
||||
waitmovement 0
|
||||
applymovement 2, Common_Movement_Delay48
|
||||
applymovement LOCALID_RIVAL, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT
|
||||
@@ -102,26 +106,26 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
|
||||
|
||||
EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
|
||||
closemessage
|
||||
addobject 3
|
||||
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
|
||||
addobject LOCALID_BIRCH
|
||||
applymovement LOCALID_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
|
||||
waitmovement 0
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT
|
||||
call ProfBirch_EventScript_RatePokedex
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT
|
||||
applymovement 1, Common_Movement_WalkInPlaceFastestUp
|
||||
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestUp
|
||||
waitmovement 0
|
||||
delay 20
|
||||
applymovement 1, Common_Movement_WalkInPlaceFastestDown
|
||||
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestDown
|
||||
waitmovement 0
|
||||
msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
delay 30
|
||||
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
|
||||
applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
|
||||
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart
|
||||
applymovement 3, Common_Movement_WalkInPlaceFastestUp
|
||||
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
|
||||
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestUp
|
||||
applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
|
||||
waitmovement 0
|
||||
delay 20
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
|
||||
@@ -133,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
|
||||
compare VAR_RESULT, FEMALE
|
||||
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
|
||||
closemessage
|
||||
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
|
||||
applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
|
||||
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit
|
||||
waitmovement 0
|
||||
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
|
||||
@@ -151,14 +155,14 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4
|
||||
return
|
||||
|
||||
EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD
|
||||
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
|
||||
applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12
|
||||
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth
|
||||
applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user