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/PokemonTower_2F | |
| parent | a34c9d09b6b4da949ec6da6fa31b9f6eb12bdbee (diff) | |
Use more LOCALID constants
Diffstat (limited to 'data/maps/PokemonTower_2F')
| -rw-r--r-- | data/maps/PokemonTower_2F/scripts.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 20cbe6090..5d8091adc 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_RIVAL, 1 + PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 @@ -24,12 +26,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox PokemonTower_2F_Text_RivalIntro - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_RIVAL compare VAR_STARTER_MON, 2 call_if_eq PokemonTower_2F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 @@ -46,19 +48,19 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 playse SE_EXIT delay 25 fadedefaultbgm - removeobject 1 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339 - applymovement 1, Movement_WalkInPlaceFastestRight + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -76,12 +78,12 @@ PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373 return PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E - applymovement 1, PokemonTower_2F_Movement_RivalExitRight + applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight waitmovement 0 return PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389 - applymovement 1, PokemonTower_2F_Movement_RivalExitDown + applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown waitmovement 0 return |