diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
| commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
| tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/EverGrandeCity_PokemonCenter_1F | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/EverGrandeCity_PokemonCenter_1F')
| -rw-r--r-- | data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc | 12 |
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 |