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/PowerPlant/scripts.inc
+13 -23
View File
@@ -9,8 +9,7 @@ PowerPlant_OnResume::
PowerPlant_EventScript_TryRemoveStaticMon::
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
@@ -38,7 +37,7 @@ PowerPlant_EventScript_Zapdos::
special QuestLog_CutRecording
lock
faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
setwildbattle SPECIES_ZAPDOS, 50
waitse
playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER
message Text_Gyaoo
@@ -52,12 +51,9 @@ PowerPlant_EventScript_Zapdos::
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_DefeatedZapdos
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq PowerPlant_EventScript_RanFromZapdos
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq PowerPlant_EventScript_RanFromZapdos
goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_DefeatedZapdos
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_RanFromZapdos
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_RanFromZapdos
setflag FLAG_FOUGHT_ZAPDOS
release
end
@@ -76,7 +72,7 @@ PowerPlant_EventScript_Electrode1::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
setwildbattle SPECIES_ELECTRODE, 34
waitse
playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40
@@ -86,12 +82,9 @@ PowerPlant_EventScript_Electrode1::
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special QuestLog_CutRecording
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_FoughtElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_FoughtElectrode1
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_FoughtElectrode1
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
release
end
@@ -105,7 +98,7 @@ PowerPlant_EventScript_Electrode2::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
setwildbattle SPECIES_ELECTRODE, 34
waitse
playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40
@@ -115,12 +108,9 @@ PowerPlant_EventScript_Electrode2::
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special QuestLog_CutRecording
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_WON, PowerPlant_EventScript_FoughtElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, PowerPlant_EventScript_FoughtElectrode2
goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, PowerPlant_EventScript_FoughtElectrode2
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
release
end