Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR authored and GitHub committed 2019-09-17 00:10:23 -04:00
commit 945d3d3a27
161 files changed
+12548 -11791

No files matched your search

@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
.2byte 0
EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
turnobject EVENT_OBJ_ID_PLAYER, 2
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14