Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-02-22 18:42:20 -05:00
commit 23d7c00c62
29 files changed
+851 -813

No files matched your search

+1 -1
View File
@@ -51,7 +51,7 @@
"x": 36,
"y": 15,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWEST",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWER",
"movement_range_x": 4,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",