Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions
+2 -2
View File
@@ -206,10 +206,10 @@ Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003
Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT
closemessage
fadescreen 1
fadescreen FADE_TO_BLACK
playse SE_SELECT
delay 30
fadescreen 0
fadescreen FADE_FROM_BLACK
msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
compare VAR_0x8009, 0
call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute