Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-22 12:18:48 -04:00
committed by GitHub
94 changed files with 2841 additions and 2662 deletions

View File

@@ -764,7 +764,7 @@ SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
case 9, SlateportCity_EventScript_1DD522
case 10, SlateportCity_EventScript_1DD536
case 11, SlateportCity_EventScript_1DD54A
case 127, SlateportCity_EventScript_1DD54A
case MULTI_B_PRESSED, SlateportCity_EventScript_1DD54A
end
SlateportCity_EventScript_1DD46E:: @ 81DD46E