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/MtEmber_Summit/scripts.inc
+9 -9
View File
@@ -1,35 +1,35 @@
MtEmber_Summit_MapScripts:: @ 8163AFC
MtEmber_Summit_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Summit_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MtEmber_Summit_OnResume
.byte 0
MtEmber_Summit_OnResume:: @ 8163B07
MtEmber_Summit_OnResume::
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, MtEmber_Summit_EventScript_TryRemoveMoltres
end
MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11
MtEmber_Summit_EventScript_TryRemoveMoltres::
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject VAR_LAST_TALKED
return
MtEmber_Summit_OnTransition:: @ 8163B25
MtEmber_Summit_OnTransition::
call_if_unset FLAG_FOUGHT_MOLTRES, MtEmber_Summit_EventScript_ShowMoltres
end
MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F
MtEmber_Summit_EventScript_ShowMoltres::
clearflag FLAG_HIDE_MOLTRES
return
MtEmber_Summit_EventScript_Moltres:: @ 8163B33
MtEmber_Summit_EventScript_Moltres::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
lock
faceplayer
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
waitse
playmoncry SPECIES_MOLTRES, 2
playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER
message Text_Gyaoo
waitmessage
waitmoncry
@@ -51,12 +51,12 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33
release
end
MtEmber_Summit_EventScript_DefeatedMoltres:: @ 8163B96
MtEmber_Summit_EventScript_DefeatedMoltres::
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_RemoveStaticMon
end
MtEmber_Summit_EventScript_RanFromMoltres:: @ 8163B9F
MtEmber_Summit_EventScript_RanFromMoltres::
setvar VAR_0x8004, SPECIES_MOLTRES
goto EventScript_MonFlewAway
end