merge trainer hill changes

This commit is contained in:
shinny456
2019-01-19 10:44:58 -05:00
55 changed files with 8693 additions and 9892 deletions
-9327
View File
File diff suppressed because it is too large Load Diff
+7087
View File
File diff suppressed because it is too large Load Diff