diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-21 01:56:57 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-06-22 17:18:58 -0400 |
| commit | fac62881560190b3380d7fdbf197aa48ce337982 (patch) | |
| tree | 028ddeb79c29fb61466b630ef7ff05706a7f81a0 /data/maps/MtChimney | |
| parent | 46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff) | |
Add local object event ids for referenced objects
Diffstat (limited to 'data/maps/MtChimney')
| -rw-r--r-- | data/maps/MtChimney/scripts.inc | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 9e1213c1b..42ebce0f9 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,3 +1,10 @@ +.set LOCALID_ARCHIE, 1 +.set LOCALID_MAXIE, 2 +.set LOCALID_TABITHA, 3 +.set LOCALID_MAGMA_GRUNT_2, 22 +.set LOCALID_MAGMA_GRUNT_1, 29 + + MtChimney_MapScripts:: @ 822EDC1 map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition @@ -17,7 +24,7 @@ MtChimney_EventScript_Archie:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting closemessage - applymovement 1, Common_Movement_FaceOriginalDirection + applymovement LOCALID_ARCHIE, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +42,12 @@ MtChimney_EventScript_Maxie:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT - applymovement 2, Common_Movement_FacePlayer + applymovement LOCALID_MAXIE, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, Common_Movement_ExclamationMark + applymovement LOCALID_MAXIE, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Common_Movement_Delay48 + applymovement LOCALID_MAXIE, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat @@ -48,14 +55,14 @@ MtChimney_EventScript_Maxie:: @ 822EE0B closemessage delay 30 fadescreen FADE_TO_BLACK - removeobject 2 - removeobject 29 - removeobject 3 - removeobject 22 + removeobject LOCALID_MAXIE + removeobject LOCALID_MAGMA_GRUNT_1 + removeobject LOCALID_TABITHA + removeobject LOCALID_MAGMA_GRUNT_2 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA fadescreen FADE_FROM_BLACK - setobjectxyperm 1, 10, 12 - addobject 1 + setobjectxyperm LOCALID_ARCHIE, 10, 12 + addobject LOCALID_ARCHIE compare VAR_FACING, DIR_EAST call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast compare VAR_FACING, DIR_NORTH @@ -68,7 +75,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B call_if_eq MtChimney_EventScript_ArchieExitEast compare VAR_FACING, DIR_NORTH call_if_eq MtChimney_EventScript_ArchieExitNorth - removeobject 1 + removeobject LOCALID_ARCHIE setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY clearflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO @@ -78,22 +85,22 @@ MtChimney_EventScript_Maxie:: @ 822EE0B end MtChimney_EventScript_ArchieApproachPlayerEast:: @ 822EEC7 - applymovement 1, MtChimney_Movement_ArchieApproachPlayerEast + applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast waitmovement 0 return MtChimney_EventScript_ArchieApproachPlayerNorth:: @ 822EED2 - applymovement 1, MtChimney_Movement_ArchieApproachPlayerNorth + applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth waitmovement 0 return MtChimney_EventScript_ArchieExitEast:: @ 822EEDD - applymovement 1, MtChimney_Movement_ArchieExitEast + applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitEast waitmovement 0 return MtChimney_EventScript_ArchieExitNorth:: @ 822EEE8 - applymovement 1, MtChimney_Movement_ArchieExitNorth + applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitNorth waitmovement 0 return |