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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCave_B1F/scripts.inc
+5 -9
View File
@@ -9,8 +9,7 @@ CeruleanCave_B1F_OnResume::
CeruleanCave_B1F_EventScript_TryRemoveMewtwo::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
removeobject VAR_LAST_TALKED
return
@@ -35,18 +34,15 @@ CeruleanCave_B1F_EventScript_Mewtwo::
delay 20
playbgm MUS_ENCOUNTER_GYM_LEADER, 0
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setwildbattle SPECIES_MEWTWO, 70
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq CeruleanCave_B1F_EventScript_DefeatedMewtwo
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq CeruleanCave_B1F_EventScript_RanFromMewtwo
goto_if_eq VAR_RESULT, B_OUTCOME_WON, CeruleanCave_B1F_EventScript_DefeatedMewtwo
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, CeruleanCave_B1F_EventScript_RanFromMewtwo
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, CeruleanCave_B1F_EventScript_RanFromMewtwo
setflag FLAG_FOUGHT_MEWTWO
release
end