diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-30 15:38:46 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-30 15:38:46 -0500 |
| commit | 676ffb73cad2a5ec4173a09d525fda68dd2bd0f7 (patch) | |
| tree | 0906eb163e1b455118aabd2282cd1860c328e6ee /data/scripts | |
| parent | b4ba35a54c0f6204e34d2814351162c79ea4c0ba (diff) | |
stuff... I don't remember
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/Route111.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index cad2c6a48..214c61142 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - settrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag OPPONENT_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 879735ece..de37c68fc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D setflag 769 setflag 770 setflag 771 - settrainerflag OPPONENT_VICTOR - settrainerflag OPPONENT_VICTORIA - settrainerflag OPPONENT_VIVI + cleartrainerflag OPPONENT_VICTOR + cleartrainerflag OPPONENT_VICTORIA + cleartrainerflag OPPONENT_VIVI end Route111_EventScript_150023:: @ 8150023 |