diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/scripts/trainer_battle.inc | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/scripts/trainer_battle.inc')
| -rw-r--r-- | data/scripts/trainer_battle.inc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index c205a9d22..d609fcc93 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,3 +1,7 @@ +EventScript_271354:: @ 8271354 + cmdD8 + cmdD9 + EventScript_ShowSecondTrainerIntro:: @ 8271356 special SetUpTrainerEncounterMusic special EndTrainerApproach @@ -26,7 +30,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A compare VAR_RESULT, 0 goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -69,7 +73,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 compare VAR_RESULT, 0 goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -126,3 +130,10 @@ EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript releaseall end + +Std_MsgboxAutoclose:: @ 8271494 + message 0x0 + waitmessage + waitbuttonpress + release + return |