diff options
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 8f9e8ae26..dbb81864b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -841,42 +841,42 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special PlayTrainerEncounterMusic + special SetUpTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 -gUnknown_81A4EC1:: @ 81A4EC1 +EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 lock faceplayer applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, GetTrainerFlag compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4EE8 - special PlayTrainerEncounterMusic - special sub_8080398 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement goto EventScript_1A4FC7 EventScript_1A4EE8:: @ 81A4EE8 ontrainerbattleend -gUnknown_81A4EE9:: @ 81A4EE9 +EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer call EventScript_1A4FBA - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, GetTrainerFlag compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4F19 - special PlayTrainerEncounterMusic - special sub_8080398 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement goto EventScript_1A4FC7 EventScript_1A4F19:: @ 81A4F19 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -885,30 +885,30 @@ EventScript_1A4F19:: @ 81A4F19 EventScript_1A4F20:: @ 81A4F20 ontrainerbattleend -gUnknown_81A4F21:: @ 81A4F21 +EventScript_DoTrainerBattle:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special PlayTrainerEncounterMusic + special SetUpTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend -gUnknown_81A4F3E:: @ 81A4F3E +EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 - special PlayTrainerEncounterMusic - special sub_8080398 - special sub_80805D8 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 - special sub_80805B0 + special BattleSetup_StartRematchBattle waitstate releaseall end @@ -916,22 +916,22 @@ gUnknown_81A4F3E:: @ 81A4F3E EventScript_1A4F72:: @ 81A4F72 ontrainerbattleend -gUnknown_81A4F73:: @ 81A4F73 +EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 - special PlayTrainerEncounterMusic - special sub_8080398 - special sub_80805D8 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 - special sub_80805B0 + special BattleSetup_StartRematchBattle waitstate releaseall end @@ -940,7 +940,7 @@ EventScript_1A4FB0:: @ 81A4FB0 ontrainerbattleend EventScript_1A4FB1:: @ 81A4FB1 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -960,14 +960,14 @@ Movement_1A4FC5:: @ 81A4FC5 step_end EventScript_1A4FC7:: @ 81A4FC7 - special sub_80805D8 + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin - specialvar VAR_RESULT, sub_80803CC + specialvar VAR_RESULT, GetTrainerBattleMode compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A5017 compare_var_to_value VAR_RESULT, 2 @@ -987,7 +987,7 @@ EventScript_1A5019:: @ 81A5019 ontrainerbattleendgoto EventScript_1A501A:: @ 81A501A - special sub_80803FC + special SetBattledTrainerFlag releaseall end |