diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-21 03:07:59 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-21 03:08:10 +0800 |
| commit | b0400ef6ba6e6cf49ad2bdc19a29eb2abef26701 (patch) | |
| tree | 60276257dd8cccfa1278bb0302cf948ae8ab79fa /data | |
| parent | e48725d9b54ed9f71f65c3ba5577cffa8f4887d1 (diff) | |
battle_setup funcs
Diffstat (limited to 'data')
| -rw-r--r-- | data/map_event_scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 4e61859a6..8d33ad951 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -790,7 +790,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 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 5, EventScript_1A4EE8 special SetUpTrainerEncounterMusic @@ -804,7 +804,7 @@ 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 5, EventScript_1A4F20 special CheckForAlivePartyMons diff --git a/data/specials.inc b/data/specials.inc index 3968d01d3..c88cf8340 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -63,7 +63,7 @@ gSpecials:: @ 815FD60 def_special GetTrainerBattleMode def_special ShowTrainerIntroSpeech def_special ShowTrainerCantBattleSpeech - def_special ScrSpecial_HasTrainerBeenFought + def_special GetTrainerFlag def_special ScrSpecial_EndTrainerApproach def_special SetUpTrainerEncounterMusic def_special sub_810CD4C |