diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-06-01 20:40:27 -0400 |
| commit | f0b41debc35c2084aad6d369eab11a2d2df4ab44 (patch) | |
| tree | 9b720ab0b617fa207051efc7ff9373669f7dc47b /data/scripts/trainer_battle.inc | |
| parent | a839463c849679974c986bf9c9c260eff0e94cb7 (diff) | |
| parent | 9f5bf65fb336cf7a3ba68d32267bf993f0f6a494 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
Diffstat (limited to 'data/scripts/trainer_battle.inc')
| -rw-r--r-- | data/scripts/trainer_battle.inc | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index aa96e7b35..0b5c1118b 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,10 +1,9 @@ -EventScript_271354:: @ 8271354 - cmdD8 - cmdD9 - -EventScript_ShowSecondTrainerIntro:: @ 8271356 - special SetUpTrainerEncounterMusic - special EndTrainerApproach +EventScript_StartTrainerApproach:: @ 8271354 + selectapproachingtrainer + lockfortrainer +EventScript_TrainerApproach:: @ 8271356 + special PlayTrainerEncounterMusic + special DoTrainerApproach waitstate goto EventScript_ShowTrainerIntroMsg @@ -14,11 +13,12 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362 applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 specialvar VAR_RESULT, GetTrainerFlag - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_ne EventScript_NoNormalTrainerBattle - special SetUpTrainerEncounterMusic - special SetUpTrainerMovement + special PlayTrainerEncounterMusic + special SetTrainerFacingDirection goto EventScript_ShowTrainerIntroMsg + EventScript_NoNormalTrainerBattle:: @ 8271389 gotopostbattlescript @@ -27,27 +27,29 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A faceplayer call EventScript_RevealTrainer specialvar VAR_RESULT, GetTrainerFlag - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle - special SetUpTrainerEncounterMusic - special SetUpTrainerMovement + special PlayTrainerEncounterMusic + special SetTrainerFacingDirection goto EventScript_ShowTrainerIntroMsg + EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end + EventScript_NoDoubleTrainerBattle:: @ 82713C1 gotopostbattlescript EventScript_DoNoIntroTrainerBattle:: @ 82713C2 applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic trainerbattlebegin gotopostbattlescript @@ -56,8 +58,8 @@ EventScript_TryDoRematchBattle:: @ 82713D1 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, FALSE goto_if_eq EventScript_NoRematchTrainerBattle - special SetUpTrainerEncounterMusic - special SetUpTrainerMovement + special PlayTrainerEncounterMusic + special SetTrainerFacingDirection special ShowTrainerIntroSpeech waitmessage waitbuttonpress @@ -65,6 +67,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1 waitstate releaseall end + EventScript_NoRematchTrainerBattle:: @ 82713F7 gotopostbattlescript @@ -75,8 +78,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle - special SetUpTrainerEncounterMusic - special SetUpTrainerMovement + special PlayTrainerEncounterMusic + special SetTrainerFacingDirection special ShowTrainerIntroSpeech waitmessage waitbuttonpress @@ -84,8 +87,10 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 waitstate releaseall end + EventScript_NoDoubleRematchTrainerBattle:: @ 8271427 gotopostbattlescript + EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428 special ShowTrainerCantBattleSpeech waitmessage @@ -108,7 +113,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C waitbuttonpress special TryPrepareSecondApproachingTrainer compare VAR_RESULT, TRUE - goto_if_eq EventScript_ShowSecondTrainerIntro + goto_if_eq EventScript_TrainerApproach goto EventScript_DoTrainerBattle EventScript_DoTrainerBattle:: @ 8271454 |