Merge branch 'master' into doc-trickhouse

This commit is contained in:
GriffinR
2019-11-06 19:49:14 -05:00
committed by GitHub
77 changed files with 1302 additions and 1179 deletions

View File

@@ -206,7 +206,7 @@ Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF
return
Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002
call Common_EventScript_NoRoomLeftForAnother
call Common_EventScript_NoRoomForDecor
msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
return