Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions
+1 -1
View File
@@ -219,7 +219,7 @@ TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
TrainerHill_Entrance_EventScript_Records:: @ 8268388
lockall
fadescreen 1
fadescreen FADE_TO_BLACK
special ShowTrainerHillRecords
waitstate
releaseall