diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 00:33:42 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 01:31:50 +0800 |
| commit | 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a (patch) | |
| tree | 8fc6f5b6bb323f408a4f0c117f89fd66b7161440 /data | |
| parent | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (diff) | |
clean up
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 16 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 8762619db..e6d967221 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -842,7 +842,7 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 @@ -852,10 +852,10 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 faceplayer applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - specialvar VAR_RESULT, GetTrainerFlag + specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4EE8 - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_1A4FC7 @@ -866,13 +866,13 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer call EventScript_1A4FBA - specialvar VAR_RESULT, GetTrainerFlag + specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought 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 SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_1A4FC7 @@ -889,7 +889,7 @@ EventScript_1A4F20:: @ 81A4F20 EventScript_DoTrainerBattle:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A501A @@ -901,7 +901,7 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special SetUpTrainerMovement special ScrSpecial_ShowTrainerIntroSpeech waitmessage @@ -924,7 +924,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 - special SetUpTrainerEncounterMusic + special PlayTrainerEncounterMusic special SetUpTrainerMovement special ScrSpecial_ShowTrainerIntroSpeech waitmessage diff --git a/data/specials.inc b/data/specials.inc index 8ef7a0671..44d906656 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -62,9 +62,9 @@ gSpecials:: @ 815FD60 def_special ScrSpecial_GetTrainerBattleMode def_special ScrSpecial_ShowTrainerIntroSpeech def_special ScrSpecial_ShowTrainerNonBattlingSpeech - def_special GetTrainerFlag + def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach - def_special SetUpTrainerEncounterMusic + def_special PlayTrainerEncounterMusic def_special ShouldTryRematchBattle def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch |