summaryrefslogtreecommitdiff
path: root/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc')
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 333bffc37..3b6d94249 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -1,3 +1,6 @@
+.set LOCALID_NURSE, 1
+.set LOCALID_SCOTT, 4
+
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -13,9 +16,8 @@ EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: @ 8229A4C
clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
return
-@ VAR_0x800B is the Nurse's object event id
EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59
- setvar VAR_0x800B, 1
+ setvar VAR_0x800B, LOCALID_NURSE
call Common_EventScript_PkmnCenterNurse
waitmessage
waitbuttonpress
@@ -45,17 +47,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
setflag FLAG_MET_SCOTT_IN_EVERGRANDE
playse SE_KAIDAN
waitse
- removeobject 4
+ removeobject LOCALID_SCOTT
release
end
EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: @ 8229AB6
- applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth
+ applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth
waitmovement 0
return
EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: @ 8229AC1
- applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit
+ applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit
waitmovement 0
return