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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PowerPlant/scripts.inc
+17 -17
View File
@@ -1,46 +1,46 @@
PowerPlant_MapScripts:: @ 8163764
PowerPlant_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition
.byte 0
PowerPlant_OnResume:: @ 816376F
PowerPlant_OnResume::
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, PowerPlant_EventScript_TryRemoveStaticMon
end
PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779
PowerPlant_EventScript_TryRemoveStaticMon::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
PowerPlant_OnTransition:: @ 816378D
PowerPlant_OnTransition::
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
call_if_unset FLAG_FOUGHT_ZAPDOS, PowerPlant_EventScript_ShowZapdos
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, PowerPlant_EventScript_ShowElectrode1
call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, PowerPlant_EventScript_ShowElectrode2
end
PowerPlant_EventScript_ShowZapdos:: @ 81637AC
PowerPlant_EventScript_ShowZapdos::
clearflag FLAG_HIDE_ZAPDOS
return
PowerPlant_EventScript_ShowElectrode1:: @ 81637B0
PowerPlant_EventScript_ShowElectrode1::
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1
return
PowerPlant_EventScript_ShowElectrode2:: @ 81637B4
PowerPlant_EventScript_ShowElectrode2::
clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2
return
PowerPlant_EventScript_Zapdos:: @ 81637B8
PowerPlant_EventScript_Zapdos::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
lock
faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
waitse
playmoncry SPECIES_ZAPDOS, 2
playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER
message Text_Gyaoo
waitmessage
waitmoncry
@@ -62,23 +62,23 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8
release
end
PowerPlant_EventScript_DefeatedZapdos:: @ 816381B
PowerPlant_EventScript_DefeatedZapdos::
setflag FLAG_FOUGHT_ZAPDOS
goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_RanFromZapdos:: @ 8163824
PowerPlant_EventScript_RanFromZapdos::
setvar VAR_0x8004, SPECIES_ZAPDOS
goto EventScript_MonFlewAway
end
PowerPlant_EventScript_Electrode1:: @ 816382F
PowerPlant_EventScript_Electrode1::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
waitse
playmoncry SPECIES_ELECTRODE, 2
playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40
waitmoncry
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
@@ -96,18 +96,18 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
release
end
PowerPlant_EventScript_FoughtElectrode1:: @ 8163884
PowerPlant_EventScript_FoughtElectrode1::
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1
goto EventScript_RemoveStaticMon
end
PowerPlant_EventScript_Electrode2:: @ 816388D
PowerPlant_EventScript_Electrode2::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
waitse
playmoncry SPECIES_ELECTRODE, 2
playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40
waitmoncry
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
@@ -125,7 +125,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
release
end
PowerPlant_EventScript_FoughtElectrode2:: @ 81638E2
PowerPlant_EventScript_FoughtElectrode2::
setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2
goto EventScript_RemoveStaticMon
end