dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/maps/SSTidalCorridor/scripts.inc
View File

@@ -174,22 +174,14 @@ SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
end
SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
checktrainerflag TRAINER_PHILLIP
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_LEONARD
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_COLTON
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_MICAH
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_THOMAS
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_LEA_AND_JED
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_GARRET
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
checktrainerflag TRAINER_NAOMI
goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_MICAH, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_TrainerNotDefeated
goto_if_not_defeated TRAINER_NAOMI, SSTidalCorridor_EventScript_TrainerNotDefeated
setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
goto SSTidalCorridor_EventScript_EnjoyYourCruise
return