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

Combine special prefixes, drop more

Browse Source
This commit is contained in:
GriffinR
2020-03-04 10:42:16 -05:00
parent ce3e1b8af0
commit 13e06bf7f8
23 changed files with 98 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/trainer_battle.inc
+2 -2
View File
@@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
faceplayer
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoTrainerBattle
special PlayTrainerEncounterMusic
@@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock
faceplayer
call EventScript_RevealTrainer
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle