Port some macro/script fixes from pokefirered

This commit is contained in:
GriffinR
2020-01-11 12:02:58 -05:00
parent 8b1595ebc3
commit f2e7b1507e
107 changed files with 528 additions and 561 deletions

View File

@@ -31,7 +31,7 @@ Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E
compare VAR_GLASS_WORKSHOP_STATE, 1
goto_if_eq Route113_GlassWorkshop_EventScript_ExplainSootSack
msgbox Route113_GlassWorkshop_Text_GoCollectAshWithThis, MSGBOX_DEFAULT
giveitem_std ITEM_SOOT_SACK
giveitem ITEM_SOOT_SACK
setvar VAR_GLASS_WORKSHOP_STATE, 1
msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
release
@@ -220,13 +220,13 @@ Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
end
Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047
giveitem_std VAR_0x8008
giveitem VAR_0x8008
compare VAR_RESULT, FALSE
goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute
return
Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F
givedecoration_std VAR_0x8008
givedecoration VAR_0x8008
compare VAR_RESULT, FALSE
goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor
return