dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battle_setup funcs

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-21 03:07:59 +08:00
parent e48725d9b5
commit b0400ef6ba
41 changed files with 1105 additions and 2346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/map_event_scripts.inc
+2 -2
View File
@@ -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
data/specials.inc
+1 -1
View File
@@ -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