atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made talking to defeated trainers follower-safe.

Browse source
This commit is contained in:
Ariel A 2022-08-06 20:44:15 -04:00
parent 7edb7bbc23
commit 37ca4a6ceb
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/scripts/trainer_battle.inc
View file

@ -10,6 +10,7 @@ EventScript_TrainerApproach::
EventScript_TryDoNormalTrainerBattle:: EventScript_TryDoNormalTrainerBattle::
lock lock
faceplayer faceplayer
setflag FLAG_SAFE_FOLLOWER_MOVEMENT
applymovement VAR_LAST_TALKED, Movement_RevealTrainer applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0 waitmovement 0
specialvar VAR_RESULT, GetTrainerFlag specialvar VAR_RESULT, GetTrainerFlag
@ -44,6 +45,7 @@ EventScript_NoDoubleTrainerBattle::
gotopostbattlescript gotopostbattlescript
EventScript_DoNoIntroTrainerBattle:: EventScript_DoNoIntroTrainerBattle::
setflag FLAG_SAFE_FOLLOWER_MOVEMENT
applymovement VAR_LAST_TALKED, Movement_RevealTrainer applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0 waitmovement 0
special PlayTrainerEncounterMusic special PlayTrainerEncounterMusic
@ -93,6 +95,7 @@ EventScript_NotEnoughMonsForDoubleRematchBattle::
end end
EventScript_RevealTrainer:: EventScript_RevealTrainer::
setflag FLAG_SAFE_FOLLOWER_MOVEMENT
applymovement VAR_LAST_TALKED, Movement_RevealTrainer applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0 waitmovement 0
return return