Merge branch 'master' into event-flags

2018-10-17 12:30:45 -04:00
parent ff97873c30 f67bbbdaaa
commit 7d88b9647f
56 changed files with 1280 additions and 2679 deletions
@@ -927,7 +927,7 @@ SootopolisCity_EventScript_1E6154:: @ 81E6154
 	msgbox SootopolisCity_Text_1E65C8, 3
 	end

-SootopolisCity_EventScript_1E615D:: @ 81E615D
+EventScript_ClosedSootopolisDoor:: @ 81E615D
 	msgbox SootopolisCity_Text_1E6604, 3
 	end