Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2019-12-18 13:16:38 -05:00
commit 949509aade
82 files changed
+3472 -6562

No files matched your search

+4 -4
View File
@@ -76,16 +76,16 @@ SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771
end
SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C
fadescreenswapbuffers 1
fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
fadescreenswapbuffers FADE_FROM_BLACK
releaseall
end
SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
fadescreenswapbuffers 1
fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
fadescreenswapbuffers FADE_FROM_BLACK
bufferspeciesname 0, VAR_0x8004
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
releaseall