diff options
Diffstat (limited to 'data/scripts/trainer_battle.inc')
| -rw-r--r-- | data/scripts/trainer_battle.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 61a1afa25..c205a9d22 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -11,7 +11,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362 waitmovement 0 specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoNormalTrainerBattle + goto_if_ne EventScript_NoNormalTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -24,10 +24,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A call EventScript_RevealTrainer specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoDoubleTrainerBattle + goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -51,7 +51,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1 call EventScript_RevealTrainer specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoRematchTrainerBattle + goto_if_eq EventScript_NoRematchTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -67,10 +67,10 @@ EventScript_NoRematchTrainerBattle:: @ 82713F7 EventScript_TryDoDoubleRematchBattle:: @ 82713F8 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoDoubleRematchTrainerBattle + goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -104,7 +104,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C waitbuttonpress special TryPrepareSecondApproachingTrainer compare VAR_RESULT, TRUE - goto_eq EventScript_ShowSecondTrainerIntro + goto_if_eq EventScript_ShowSecondTrainerIntro goto EventScript_DoTrainerBattle EventScript_DoTrainerBattle:: @ 8271454 @@ -112,15 +112,15 @@ EventScript_DoTrainerBattle:: @ 8271454 @ Pointless check, possibly used for debugging? specialvar VAR_RESULT, GetTrainerBattleMode compare VAR_RESULT, TRAINER_BATTLE_SINGLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript |