diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-10 20:20:15 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-02-10 20:20:15 -0500 |
| commit | 515dde69afea00d7eafd0693ee423fcc1ae0bac5 (patch) | |
| tree | b8c04472d094e72e87bd11a83204a3f5e6eb5500 /data/maps/SilphCo_7F/scripts.inc | |
| parent | a34c9d09b6b4da949ec6da6fa31b9f6eb12bdbee (diff) | |
Use more LOCALID constants
Diffstat (limited to 'data/maps/SilphCo_7F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_7F/scripts.inc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index c43c8bad1..c276483f5 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_RIVAL, 1 +.set LOCALID_WORKER_M2, 8 + SilphCo_7F_MapScripts:: @ 8161984 map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition @@ -15,7 +18,7 @@ SilphCo_7F_OnTransition:: @ 81619AB end SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7 - setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP return SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC @@ -33,10 +36,10 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown - applymovement 1, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou compare VAR_TEMP_1, 0 @@ -44,7 +47,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalApproachBottom msgbox SilphCo_7F_Text_RivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq SilphCo_7F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 @@ -60,7 +63,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalExitBottom playse SE_WARP_IN fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL waitse setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall @@ -68,7 +71,7 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73 closemessage - applymovement 1, SilphCo_7F_Movement_RivalApproachTop + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return @@ -88,12 +91,12 @@ SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96 return SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1 - applymovement 1, SilphCo_7F_Movement_RivalExitTop + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC - applymovement 1, SilphCo_7F_Movement_RivalExitBottom + applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return |